From 346509b1d73003d45e34ff8c936e7f7e6cc47996 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 26 Dec 2023 18:07:44 +0200 Subject: [PATCH 001/131] Add YAML fixture for forwarding-all-arguments argument --- .../forward_arguments.yaml | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 spec/truffle/parsing/fixtures/def/parameter_forwarding/forward_arguments.yaml diff --git a/spec/truffle/parsing/fixtures/def/parameter_forwarding/forward_arguments.yaml b/spec/truffle/parsing/fixtures/def/parameter_forwarding/forward_arguments.yaml new file mode 100644 index 000000000000..c81fe7d23792 --- /dev/null +++ b/spec/truffle/parsing/fixtures/def/parameter_forwarding/forward_arguments.yaml @@ -0,0 +1,159 @@ +subject: "Def" +description: "parameter forwarding / forward arguments (...)" +focused_on_node: "org.truffleruby.language.methods.LiteralMethodDefinitionNode" +ruby: | + def foo(...) + bar(...) + end +ast: | + LiteralMethodDefinitionNode + attributes: + callTargetSupplier = org.truffleruby.language.methods.CachedLazyCallTargetSupplier@... + flags = 1 + isDefSingleton = false + name = "foo" + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = true, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_rest, type = rest), ArgumentDescriptor(name = %forward_kwrest, type = keyrest), ArgumentDescriptor(name = %forward_block, type = block)]) + call targets: + RubyMethodRootNode + attributes: + arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = true, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true} + callTarget = Object#foo + checkArityProfile = false + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_rest, #3:%forward_kwrest, #4:%forward_block, #5:%method_block_arg} + instrumentationBits = 0 + keywordArguments = true + localReturnProfile = false + lock = java.util.concurrent.locks.ReentrantLock@...[Unlocked] + matchingReturnProfile = false + nonMatchingReturnProfile = false + polyglotRef = org.truffleruby.RubyLanguage@... + retryProfile = false + returnID = org.truffleruby.language.control.ReturnID@... + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = true, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_rest, type = rest), ArgumentDescriptor(name = %forward_kwrest, type = keyrest), ArgumentDescriptor(name = %forward_block, type = block)]) + split = HEURISTIC + children: + body = + SequenceNode + attributes: + flags = 12 + children: + body = [ + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + SaveMethodBlockNode + attributes: + flags = 0 + slot = 5 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %forward_rest + children: + valueNode = + ReadRestArgumentNode + attributes: + flags = 0 + keywordArguments = true + markKeywordHashWithFlag = false + postArgumentsCount = 0 + startIndex = 0 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %forward_kwrest + children: + valueNode = + ReadKeywordRestArgumentNode + attributes: + excludedKeywords = [] + flags = 0 + children: + hashes = + HashStoreLibraryGen$CachedDispatchFirst + attributes: + limit_ = 3 + readUserKeywordsHashNode = + ReadUserKeywordsHashNode + SaveMethodBlockNode + attributes: + flags = 0 + slot = 4 + RubyCallNode + attributes: + descriptor = KeywordArgumentsDescriptor(keywords = []) + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 1 + isAttrAssign = false + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "bar" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ArrayAppendOneNodeGen + attributes: + flags = 0 + children: + arrayNode_ = + KernelNodesFactory$DupASTNodeFactory$DupASTNodeGen + attributes: + flags = 0 + children: + selfNode_ = + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = true + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %forward_rest + type = FRAME_LOCAL + valueNode_ = + HashCastNodeGen$HashCastASTNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %forward_kwrest + type = FRAME_LOCAL + ] + block = + ToProcNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %forward_block + type = FRAME_LOCAL + receiver = + SelfNode + attributes: + flags = 0 + ] \ No newline at end of file From d883c085aad78aadf675ea997c819791bcce5b96 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 26 Dec 2023 19:13:31 +0200 Subject: [PATCH 002/131] Translate ForwardingArgumentsNode --- .../forward_arguments.yaml | 45 +++++---- ...at_operator_and_double_splat_operator.yaml | 92 +++++++++++++++++++ .../truffleruby/parser/YARPTranslator.java | 41 ++++++++- 3 files changed, 156 insertions(+), 22 deletions(-) create mode 100644 spec/truffle/parsing/fixtures/method_calls/arguments/with_splat_operator_and_double_splat_operator.yaml diff --git a/spec/truffle/parsing/fixtures/def/parameter_forwarding/forward_arguments.yaml b/spec/truffle/parsing/fixtures/def/parameter_forwarding/forward_arguments.yaml index c81fe7d23792..9c992cfb918e 100644 --- a/spec/truffle/parsing/fixtures/def/parameter_forwarding/forward_arguments.yaml +++ b/spec/truffle/parsing/fixtures/def/parameter_forwarding/forward_arguments.yaml @@ -1,5 +1,8 @@ subject: "Def" description: "parameter forwarding / forward arguments (...)" +notes: > + Local variable %forward_rest, %forward_kwrest and %forward_block are used to pass parameters to a method call. +yarp_specific: true # Use ArrayConcatNode instead of ArrayAppendOneNodeGen focused_on_node: "org.truffleruby.language.methods.LiteralMethodDefinitionNode" ruby: | def foo(...) @@ -106,40 +109,42 @@ ast: | notRuby2KeywordsHashProfile = false children: arguments = [ - ArrayAppendOneNodeGen + ArrayConcatNode attributes: flags = 0 children: - arrayNode_ = - KernelNodesFactory$DupASTNodeFactory$DupASTNodeGen + children = [ + SplatCastNodeGen attributes: + conversionMethod = :to_a + copy = true flags = 0 + nilBehavior = CONVERT children: - selfNode_ = - SplatCastNodeGen + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %forward_rest + type = FRAME_LOCAL + ArrayLiteralNode$UninitialisedArrayLiteralNode + attributes: + flags = 0 + language = org.truffleruby.RubyLanguage@... + children: + values = [ + HashCastNodeGen$HashCastASTNodeGen attributes: - conversionMethod = :to_a - copy = true flags = 0 - nilBehavior = CONVERT children: childNode_ = ReadLocalVariableNode attributes: flags = 0 - frameSlot = 2 # %forward_rest + frameSlot = 3 # %forward_kwrest type = FRAME_LOCAL - valueNode_ = - HashCastNodeGen$HashCastASTNodeGen - attributes: - flags = 0 - children: - childNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %forward_kwrest - type = FRAME_LOCAL + ] + ] ] block = ToProcNodeGen diff --git a/spec/truffle/parsing/fixtures/method_calls/arguments/with_splat_operator_and_double_splat_operator.yaml b/spec/truffle/parsing/fixtures/method_calls/arguments/with_splat_operator_and_double_splat_operator.yaml new file mode 100644 index 000000000000..46118e77cd66 --- /dev/null +++ b/spec/truffle/parsing/fixtures/method_calls/arguments/with_splat_operator_and_double_splat_operator.yaml @@ -0,0 +1,92 @@ +subject: "Method call" +description: "Arguments / with splat operator and double splat operator (*args, **keys)" +yarp_specific: true # Use ArrayConcatNode instead of ArrayAppendOneNodeGen +focused_on_node: "org.truffleruby.language.dispatch.RubyCallNode" +ruby: | + foo(*bar, **baz) +ast: | + RubyCallNode + attributes: + descriptor = KeywordArgumentsDescriptor(keywords = []) + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 1 + isAttrAssign = false + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ArrayConcatNode + attributes: + flags = 0 + children: + children = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = true + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "bar" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + ArrayLiteralNode$UninitialisedArrayLiteralNode + attributes: + flags = 0 + language = org.truffleruby.RubyLanguage@... + children: + values = [ + HashCastNodeGen$HashCastASTNodeGen + attributes: + flags = 0 + children: + childNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "baz" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + ] + ] + ] + receiver = + SelfNode + attributes: + flags = 0 \ No newline at end of file diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index e0a982fbb09e..a2c3dc7148cd 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -25,6 +25,7 @@ import org.truffleruby.core.IsNilNode; import org.truffleruby.core.array.ArrayConcatNode; import org.truffleruby.core.array.ArrayLiteralNode; +import org.truffleruby.core.array.ArrayUtils; import org.truffleruby.core.array.AssignableNode; import org.truffleruby.core.cast.HashCastNodeGen; import org.truffleruby.core.cast.SplatCastNode; @@ -693,13 +694,35 @@ private static RubyNode wrapCallWithLiteralBlock(ArgumentsAndBlockTranslation ar private ArgumentsAndBlockTranslation translateArgumentsAndBlock(Nodes.ArgumentsNode argumentsNode, Nodes.Node block, String methodName) { - final Nodes.Node[] arguments; + Nodes.Node[] arguments; if (argumentsNode == null) { arguments = EMPTY_NODE_ARRAY; } else { arguments = argumentsNode.arguments; } + boolean isForwardArguments = (arguments.length > 0 && + ArrayUtils.getLast(arguments) instanceof Nodes.ForwardingArgumentsNode); + + if (isForwardArguments) { + // use depth = 0 as far as it's ignored + final var readRest = new Nodes.LocalVariableReadNode(FORWARDED_REST_NAME, 0, 0, 0); + final var readKeyRest = new Nodes.LocalVariableReadNode(FORWARDED_KEYWORD_REST_NAME, 0, 0, 0); + + final var splat = new Nodes.SplatNode(readRest, 0, 0); + final var keywordHash = new Nodes.KeywordHashNode((short) 0, + new Nodes.Node[]{new Nodes.AssocSplatNode(readKeyRest, 0, 0)}, 0, 0); + + // replace '...' argument with rest and keyrest arguments + final var forwarding = new Nodes.Node[arguments.length + 1]; + System.arraycopy(arguments, 0, forwarding, 0, arguments.length - 1); + forwarding[forwarding.length - 2] = splat; + forwarding[forwarding.length - 1] = keywordHash; + + arguments = forwarding; + } + + // should be after handling of forward-argument as far as ... means there is a splatted argument boolean isSplatted = containYARPSplatNode(arguments); var argumentsDescriptor = getKeywordArgumentsDescriptor(arguments); @@ -735,6 +758,13 @@ private ArgumentsAndBlockTranslation translateArgumentsAndBlock(Nodes.ArgumentsN } else { throw CompilerDirectives.shouldNotReachHere(); } + } else if (isForwardArguments) { + // a(...) + // use depth = 0 as far as it's ignored + final var readBlock = new Nodes.LocalVariableReadNode(FORWARDED_BLOCK_NAME, 0, 0, 0); + final var readBlockNode = readBlock.accept(this); + blockNode = ToProcNodeGen.create(readBlockNode); + frameOnStackMarkerSlot = NO_FRAME_ON_STACK_MARKER; } else { blockNode = null; frameOnStackMarkerSlot = NO_FRAME_ON_STACK_MARKER; @@ -749,8 +779,15 @@ private ArgumentsDescriptor getKeywordArgumentsDescriptor(Nodes.Node[] arguments return NoKeywordArgumentsDescriptor.INSTANCE; } + // consider there are keyword arguments if the last argument is either ... or a Hash Nodes.Node last = arguments[arguments.length - 1]; + // a(...) means there are potentially forwarded keyword arguments + if (last instanceof Nodes.ForwardingArgumentsNode) { + return language.keywordArgumentsDescriptorManager + .getArgumentsDescriptor(StringUtils.EMPTY_STRING_ARRAY); + } + if (!(last instanceof Nodes.KeywordHashNode keywords)) { return NoKeywordArgumentsDescriptor.INSTANCE; } @@ -1672,7 +1709,7 @@ public RubyNode visitForNode(Nodes.ForNode node) { @Override public RubyNode visitForwardingArgumentsNode(Nodes.ForwardingArgumentsNode node) { - return defaultVisit(node); + throw CompilerDirectives.shouldNotReachHere("handled in visitCallNode"); } @Override From 1bbb35d5890b5243e98c051c26b65a8bc254154c Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Wed, 27 Dec 2023 13:34:34 +0200 Subject: [PATCH 003/131] Fix translation of Array with splat operator inside --- ...preceding_elements_and_splat_operator.yaml | 74 ++++++++++++++++++ .../array/array_with_splat_operator.yaml | 53 +++++++++++++ ...splat_operator_and_following_elements.yaml | 76 +++++++++++++++++++ ...ignment_with_nested_splatted_argument.yaml | 45 +++++------ ...ignment_with_nested_splatted_argument.yaml | 45 +++++------ ...ignment_with_nested_splatted_argument.yaml | 45 +++++------ .../truffleruby/parser/YARPTranslator.java | 17 ++++- 7 files changed, 273 insertions(+), 82 deletions(-) create mode 100644 spec/truffle/parsing/fixtures/array/array_with_preceding_elements_and_splat_operator.yaml create mode 100644 spec/truffle/parsing/fixtures/array/array_with_splat_operator.yaml create mode 100644 spec/truffle/parsing/fixtures/array/array_with_splat_operator_and_following_elements.yaml diff --git a/spec/truffle/parsing/fixtures/array/array_with_preceding_elements_and_splat_operator.yaml b/spec/truffle/parsing/fixtures/array/array_with_preceding_elements_and_splat_operator.yaml new file mode 100644 index 000000000000..f679a40af069 --- /dev/null +++ b/spec/truffle/parsing/fixtures/array/array_with_preceding_elements_and_splat_operator.yaml @@ -0,0 +1,74 @@ +subject: "Array" +description: "Array with preceding elements and splat operator ([a, b, *c])" +focused_on_node: "org.truffleruby.language.control.SequenceNode" +ruby: | + [1, 2, *foo] +ast: | + SequenceNode + attributes: + flags = 12 + children: + body = [ + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + ArrayConcatNode + attributes: + flags = 1 + children: + children = [ + ArrayLiteralNode$UninitialisedArrayLiteralNode + attributes: + flags = 0 + language = org.truffleruby.RubyLanguage@... + children: + values = [ + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 1 + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 2 + ] + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = true + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + ] + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/array/array_with_splat_operator.yaml b/spec/truffle/parsing/fixtures/array/array_with_splat_operator.yaml new file mode 100644 index 000000000000..8f204f98b77b --- /dev/null +++ b/spec/truffle/parsing/fixtures/array/array_with_splat_operator.yaml @@ -0,0 +1,53 @@ +subject: "Array" +description: "Array with splat operator ([*b])" +focused_on_node: "org.truffleruby.language.control.SequenceNode" +ruby: | + [*foo] +ast: | + SequenceNode + attributes: + flags = 12 + children: + body = [ + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = true + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/array/array_with_splat_operator_and_following_elements.yaml b/spec/truffle/parsing/fixtures/array/array_with_splat_operator_and_following_elements.yaml new file mode 100644 index 000000000000..8819c943f022 --- /dev/null +++ b/spec/truffle/parsing/fixtures/array/array_with_splat_operator_and_following_elements.yaml @@ -0,0 +1,76 @@ +subject: "Array" +description: "Array with splat operator and following elements ([*a, b, c])" +yarp_specific: true # Removed excessive SplatCastNodeGen: + # SplatCastNodeGen(UninitialisedArrayLiteralNode) -> UninitialisedArrayLiteralNode +focused_on_node: "org.truffleruby.language.control.SequenceNode" +ruby: | + [*foo, 1, 2] +ast: | + SequenceNode + attributes: + flags = 12 + children: + body = [ + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + ArrayConcatNode + attributes: + flags = 1 + children: + children = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = true + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + ArrayLiteralNode$UninitialisedArrayLiteralNode + attributes: + flags = 0 + language = org.truffleruby.RubyLanguage@... + children: + values = [ + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 1 + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 2 + ] + ] + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_nested_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_nested_splatted_argument.yaml index 7f5a0852ea2e..e5baf23dab67 100644 --- a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_nested_splatted_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_nested_splatted_argument.yaml @@ -33,40 +33,33 @@ ast: | frameSlot = 3 # %value_1 children: valueNode = - ArrayLiteralNode$UninitialisedArrayLiteralNode + SplatCastNodeGen attributes: + conversionMethod = :to_a + copy = true flags = 0 - language = org.truffleruby.RubyLanguage@... + nilBehavior = CONVERT children: - values = [ - SplatCastNodeGen + childNode_ = + RubyCallNode attributes: - conversionMethod = :to_a - copy = true + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false flags = 0 - nilBehavior = CONVERT + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "a" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - childNode_ = - RubyCallNode + receiver = + SelfNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "a" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - ] WriteLocalVariableNode attributes: flags = 0 diff --git a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_nested_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_nested_splatted_argument.yaml index e7dcbfe4f28c..9855df8adda0 100644 --- a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_nested_splatted_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_nested_splatted_argument.yaml @@ -33,40 +33,33 @@ ast: | frameSlot = 3 # %value_1 children: valueNode = - ArrayLiteralNode$UninitialisedArrayLiteralNode + SplatCastNodeGen attributes: + conversionMethod = :to_a + copy = true flags = 0 - language = org.truffleruby.RubyLanguage@... + nilBehavior = CONVERT children: - values = [ - SplatCastNodeGen + childNode_ = + RubyCallNode attributes: - conversionMethod = :to_a - copy = true + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false flags = 0 - nilBehavior = CONVERT + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "a" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - childNode_ = - RubyCallNode + receiver = + SelfNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "a" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - ] WriteLocalVariableNode attributes: flags = 0 diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml index 358b11b72366..0263b443655f 100644 --- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml @@ -33,40 +33,33 @@ ast: | frameSlot = 3 # %value_1 children: valueNode = - ArrayLiteralNode$UninitialisedArrayLiteralNode + SplatCastNodeGen attributes: + conversionMethod = :to_a + copy = true flags = 0 - language = org.truffleruby.RubyLanguage@... + nilBehavior = CONVERT children: - values = [ - SplatCastNodeGen + childNode_ = + RubyCallNode attributes: - conversionMethod = :to_a - copy = true + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false flags = 0 - nilBehavior = CONVERT + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "a" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - childNode_ = - RubyCallNode + receiver = + SelfNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "a" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - ] WriteLocalVariableNode attributes: flags = 0 diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index a2c3dc7148cd..4647e0399cb3 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -297,9 +297,15 @@ public RubyNode visitArgumentsNode(Nodes.ArgumentsNode node) { @Override public RubyNode visitArrayNode(Nodes.ArrayNode node) { - RubyNode[] elements = translate(node.elements); - RubyNode rubyNode = ArrayLiteralNode.create(language, elements); - return assignPositionAndFlags(node, rubyNode); + // handle splat operator properly (e.g [a, *b, c]) + final RubyNode rubyNode = translateExpressionsList(node.elements); + + // there are edge cases when node is already assigned a source section and flags (e.g. [*a]) + if (!rubyNode.hasSource()) { + assignPositionAndFlags(node, rubyNode); + } + + return rubyNode; } @Override @@ -3102,7 +3108,10 @@ protected FrameSlotAndDepth createFlipFlopState() { * operands. */ private RubyNode translateExpressionsList(Nodes.Node[] nodes) { assert nodes != null; - assert nodes.length > 0; + + if (nodes.length == 0) { + return ArrayLiteralNode.create(language, RubyNode.EMPTY_ARRAY); + } boolean containSplatOperator = containYARPSplatNode(nodes); From 0be8cdffa51c4eec3cc1f378eecb0c0cb97f293c Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Wed, 27 Dec 2023 15:40:18 +0200 Subject: [PATCH 004/131] Fix translation of rescue operator and assigning local variable an exception in runtime --- .../language/locals/WriteLocalVariableNode.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/truffleruby/language/locals/WriteLocalVariableNode.java b/src/main/java/org/truffleruby/language/locals/WriteLocalVariableNode.java index 43275f849bdf..53f9c5920048 100644 --- a/src/main/java/org/truffleruby/language/locals/WriteLocalVariableNode.java +++ b/src/main/java/org/truffleruby/language/locals/WriteLocalVariableNode.java @@ -26,19 +26,18 @@ public WriteLocalVariableNode(int frameSlot, RubyNode valueNode) { @Override public Object execute(VirtualFrame frame) { final Object value = valueNode.execute(frame); + assign(frame, value); + return value; + } + @Override + public void assign(VirtualFrame frame, Object value) { if (writeFrameSlotNode == null) { CompilerDirectives.transferToInterpreterAndInvalidate(); writeFrameSlotNode = insert(WriteFrameSlotNodeGen.create(frameSlot)); } writeFrameSlotNode.executeWrite(frame, value); - return value; - } - - @Override - public void assign(VirtualFrame frame, Object value) { - throw CompilerDirectives.shouldNotReachHere("Should be simplified with getSimplifiedAssignableNode()"); } @Override From 371c6ddd50b3b019e369bac1ad60fddfe6407bb8 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Wed, 27 Dec 2023 15:51:23 +0200 Subject: [PATCH 005/131] Translate Hash literal with omitted value --- ...tted_value_and_local_variable_missing.yaml | 45 +++++++++++++++++++ ...ted_value_and_local_variable_presence.yaml | 32 +++++++++++++ .../truffleruby/parser/YARPTranslator.java | 22 ++++++++- 3 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 spec/truffle/parsing/fixtures/hashes/with_omitted_value_and_local_variable_missing.yaml create mode 100644 spec/truffle/parsing/fixtures/hashes/with_omitted_value_and_local_variable_presence.yaml diff --git a/spec/truffle/parsing/fixtures/hashes/with_omitted_value_and_local_variable_missing.yaml b/spec/truffle/parsing/fixtures/hashes/with_omitted_value_and_local_variable_missing.yaml new file mode 100644 index 000000000000..16597283c83d --- /dev/null +++ b/spec/truffle/parsing/fixtures/hashes/with_omitted_value_and_local_variable_missing.yaml @@ -0,0 +1,45 @@ +subject: "Hash" +description: "with omitted value and local variable missing" +notes: > + treats name as a method call +focused_on_node: "org.truffleruby.core.hash.library.PackedHashStoreLibrary$SmallHashLiteralNode" +ruby: | + {a:, b: 42} +ast: | + PackedHashStoreLibraryFactory$SmallHashLiteralNodeGen + attributes: + flags = 1 + children: + keyValues = [ + ObjectLiteralNode + attributes: + flags = 0 + object = :a + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "a" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + ObjectLiteralNode + attributes: + flags = 0 + object = :b + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/hashes/with_omitted_value_and_local_variable_presence.yaml b/spec/truffle/parsing/fixtures/hashes/with_omitted_value_and_local_variable_presence.yaml new file mode 100644 index 000000000000..b479c0f89bd1 --- /dev/null +++ b/spec/truffle/parsing/fixtures/hashes/with_omitted_value_and_local_variable_presence.yaml @@ -0,0 +1,32 @@ +subject: "Hash" +description: "with omitted value and local variable presence" +notes: > + treats name as a local variable accessing +focused_on_node: "org.truffleruby.core.hash.library.PackedHashStoreLibrary$SmallHashLiteralNode" +ruby: | + a = 100500 + {a:, b: 42} +ast: | + PackedHashStoreLibraryFactory$SmallHashLiteralNodeGen + attributes: + flags = 1 + children: + keyValues = [ + ObjectLiteralNode + attributes: + flags = 0 + object = :a + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # a + type = FRAME_LOCAL + ObjectLiteralNode + attributes: + flags = 0 + object = :b + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + ] \ No newline at end of file diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 4647e0399cb3..755ac7cda9ac 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -1856,7 +1856,25 @@ public RubyNode visitHashNode(Nodes.HashNode node) { } keyValues.add(keyNode); - keyValues.add(assocNode.value.accept(this)); + + if (assocNode.value instanceof Nodes.ImplicitNode implicit) { + if (implicit.value instanceof Nodes.CallNode call) { + // Prism doesn't set VARIABLE_CALL flag + int flags = call.flags | Nodes.CallNodeFlags.VARIABLE_CALL; + final var copy = new Nodes.CallNode((short) flags, call.receiver, call.name, call.arguments, + call.block, call.startOffset, call.length); + + final RubyNode valueNode = copy.accept(this); + keyValues.add(valueNode); + } else if (implicit.value instanceof Nodes.LocalVariableReadNode localVariableRead) { + final RubyNode valueNode = localVariableRead.accept(this); + keyValues.add(valueNode); + } else { + throw CompilerDirectives.shouldNotReachHere(); + } + } else { + keyValues.add(assocNode.value.accept(this)); + } } else { throw CompilerDirectives.shouldNotReachHere(); } @@ -1920,7 +1938,7 @@ public RubyNode visitImaginaryNode(Nodes.ImaginaryNode node) { @Override public RubyNode visitImplicitNode(Nodes.ImplicitNode node) { - return defaultVisit(node); + throw CompilerDirectives.shouldNotReachHere("handled in #visitHashNode"); } @Override From 32ec6a0eaa539f47b7f03037b489783829aebcd8 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Wed, 27 Dec 2023 17:21:12 +0200 Subject: [PATCH 006/131] Fix translation of BEGIN node and translate it (and declare local variables within a block) immediately --- .../java/org/truffleruby/parser/YARPTranslator.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 755ac7cda9ac..f4166666989e 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -217,7 +217,7 @@ public class YARPTranslator extends AbstractNodeVisitor { }; // all the encountered BEGIN {} blocks - private final ArrayList beginBlocks = new ArrayList<>(); + private final ArrayList beginBlocks = new ArrayList<>(); public YARPTranslator( RubyLanguage language, @@ -2643,7 +2643,9 @@ public RubyNode visitPostExecutionNode(Nodes.PostExecutionNode node) { @Override public RubyNode visitPreExecutionNode(Nodes.PreExecutionNode node) { - beginBlocks.add(node); + // BEGIN should be located in the top-level context, so it safe to evaluate a block right now + RubyNode sequence = node.statements.accept(this); + beginBlocks.add(sequence); return null; } @@ -2652,12 +2654,9 @@ public RubyNode visitProgramNode(Nodes.ProgramNode node) { final RubyNode sequence = node.statements.accept(this); // add BEGIN {} blocks at the very beginning of the program - ArrayList nodes = new ArrayList<>(); - for (var begin : beginBlocks) { - nodes.add(begin.statements.accept(this)); - } - + ArrayList nodes = new ArrayList<>(beginBlocks); nodes.add(sequence); + return sequence(node, nodes); } From 256a54b339b9aebfaa30eef3b8863028a11a183c Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Wed, 27 Dec 2023 19:15:36 +0200 Subject: [PATCH 007/131] Translate & parameter and its forwarding --- spec/ruby/language/block_spec.rb | 2 +- .../with_block_without_name.yaml | 70 ++++++++++++++ .../with_block_without_name.yaml | 74 +++++++++++++++ .../with_block_without_name.yaml | 70 ++++++++++++++ .../block_without_name.yaml | 95 +++++++++++++++++++ .../forward_arguments.yaml | 2 +- ...en_declared_anonymous_block_parameter.yaml | 87 +++++++++++++++++ ...anonymous_rest_and_keyrest_parameters.yaml | 3 +- .../parser/YARPDefNodeTranslator.java | 5 +- .../parser/YARPLoadArgumentsTranslator.java | 12 ++- ...ParametersNodeToDestructureTranslator.java | 25 +++-- .../truffleruby/parser/YARPTranslator.java | 29 ++++-- 12 files changed, 451 insertions(+), 23 deletions(-) create mode 100644 spec/truffle/parsing/fixtures/def/argument_descriptors/with_block_without_name.yaml create mode 100644 spec/truffle/parsing/fixtures/def/parameters_declaration_in_a_frame/with_block_without_name.yaml create mode 100644 spec/truffle/parsing/fixtures/def/parameters_to_local_variables/with_block_without_name.yaml create mode 100644 spec/truffle/parsing/fixtures/method_calls/parameter_forwarding/block_without_name.yaml rename spec/truffle/parsing/fixtures/{def => method_calls}/parameter_forwarding/forward_arguments.yaml (99%) create mode 100644 spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_anonymous_block_parameter.yaml diff --git a/spec/ruby/language/block_spec.rb b/spec/ruby/language/block_spec.rb index 90329e2f6f51..5aa19ebf6607 100644 --- a/spec/ruby/language/block_spec.rb +++ b/spec/ruby/language/block_spec.rb @@ -921,7 +921,7 @@ def a; 1; end describe "Anonymous block forwarding" do ruby_version_is "3.1" do - it "forwards blocks to other functions that formally declare anonymous blocks" do + it "forwards blocks to other method that formally declares anonymous block" do eval <<-EOF def b(&); c(&) end def c(&); yield :non_null end diff --git a/spec/truffle/parsing/fixtures/def/argument_descriptors/with_block_without_name.yaml b/spec/truffle/parsing/fixtures/def/argument_descriptors/with_block_without_name.yaml new file mode 100644 index 000000000000..870206b0456e --- /dev/null +++ b/spec/truffle/parsing/fixtures/def/argument_descriptors/with_block_without_name.yaml @@ -0,0 +1,70 @@ +subject: "Def" +description: "Argument descriptors / with block without name (def a(&))" +notes: > + Method parameters are described (as ArgumentDescriptor[]) in the following way: + - ArgumentDescriptor(name = %forward_block, type = block) + + So the & operator without variable name is described as `block` variable with surrogate name `%forward_block`. +focused_on_node: "org.truffleruby.language.methods.LiteralMethodDefinitionNode" +ruby: | + def foo(&) + end +ast: | + LiteralMethodDefinitionNode + attributes: + callTargetSupplier = org.truffleruby.language.methods.CachedLazyCallTargetSupplier@... + flags = 1 + isDefSingleton = false + name = "foo" + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_block, type = block)]) + call targets: + RubyMethodRootNode + attributes: + arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false} + callTarget = Object#foo + checkArityProfile = false + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_block, #3:%method_block_arg} + instrumentationBits = 0 + keywordArguments = false + localReturnProfile = false + lock = java.util.concurrent.locks.ReentrantLock@...[Unlocked] + matchingReturnProfile = false + nonMatchingReturnProfile = false + polyglotRef = org.truffleruby.RubyLanguage@... + retryProfile = false + returnID = org.truffleruby.language.control.ReturnID@... + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_block, type = block)]) + split = HEURISTIC + children: + body = + SequenceNode + attributes: + flags = 12 + children: + body = [ + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + SaveMethodBlockNode + attributes: + flags = 0 + slot = 3 + SaveMethodBlockNode + attributes: + flags = 0 + slot = 2 + NilLiteralNode + attributes: + flags = 0 + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/def/parameters_declaration_in_a_frame/with_block_without_name.yaml b/spec/truffle/parsing/fixtures/def/parameters_declaration_in_a_frame/with_block_without_name.yaml new file mode 100644 index 000000000000..e66edc5fc39f --- /dev/null +++ b/spec/truffle/parsing/fixtures/def/parameters_declaration_in_a_frame/with_block_without_name.yaml @@ -0,0 +1,74 @@ +subject: "Def" +description: "Parameters declaration in a frame / with block without name (def a(&))" +notes: > + Parameters are declared in a RubyMethodRootNode's attribute frameDescriptor: + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_block, #3:%method_block_arg} + + So there are the following slots: + - 0 self + - 1 %$~_ - special variable + - 2 %forward_block - a block parameter + - 3 %method_block_arg - a variable that is used by the yield operator +focused_on_node: "org.truffleruby.language.methods.LiteralMethodDefinitionNode" +ruby: | + def foo(&) + end +ast: | + LiteralMethodDefinitionNode + attributes: + callTargetSupplier = org.truffleruby.language.methods.CachedLazyCallTargetSupplier@... + flags = 1 + isDefSingleton = false + name = "foo" + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_block, type = block)]) + call targets: + RubyMethodRootNode + attributes: + arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false} + callTarget = Object#foo + checkArityProfile = false + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_block, #3:%method_block_arg} + instrumentationBits = 0 + keywordArguments = false + localReturnProfile = false + lock = java.util.concurrent.locks.ReentrantLock@...[Unlocked] + matchingReturnProfile = false + nonMatchingReturnProfile = false + polyglotRef = org.truffleruby.RubyLanguage@... + retryProfile = false + returnID = org.truffleruby.language.control.ReturnID@... + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_block, type = block)]) + split = HEURISTIC + children: + body = + SequenceNode + attributes: + flags = 12 + children: + body = [ + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + SaveMethodBlockNode + attributes: + flags = 0 + slot = 3 + SaveMethodBlockNode + attributes: + flags = 0 + slot = 2 + NilLiteralNode + attributes: + flags = 0 + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/def/parameters_to_local_variables/with_block_without_name.yaml b/spec/truffle/parsing/fixtures/def/parameters_to_local_variables/with_block_without_name.yaml new file mode 100644 index 000000000000..6aee7c3b5705 --- /dev/null +++ b/spec/truffle/parsing/fixtures/def/parameters_to_local_variables/with_block_without_name.yaml @@ -0,0 +1,70 @@ +subject: "Def" +description: "Parameters to local variables / with block without name (def a(&))" +notes: > + There is no explicit assigning a block to a local variable %forward_block. + + The local variable is assigned implicitly with SaveMethodBlockNode and the local variable + is specified by a slot number. +focused_on_node: "org.truffleruby.language.methods.LiteralMethodDefinitionNode" +ruby: | + def foo(&) + end +ast: | + LiteralMethodDefinitionNode + attributes: + callTargetSupplier = org.truffleruby.language.methods.CachedLazyCallTargetSupplier@... + flags = 1 + isDefSingleton = false + name = "foo" + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_block, type = block)]) + call targets: + RubyMethodRootNode + attributes: + arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false} + callTarget = Object#foo + checkArityProfile = false + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_block, #3:%method_block_arg} + instrumentationBits = 0 + keywordArguments = false + localReturnProfile = false + lock = java.util.concurrent.locks.ReentrantLock@...[Unlocked] + matchingReturnProfile = false + nonMatchingReturnProfile = false + polyglotRef = org.truffleruby.RubyLanguage@... + retryProfile = false + returnID = org.truffleruby.language.control.ReturnID@... + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_block, type = block)]) + split = HEURISTIC + children: + body = + SequenceNode + attributes: + flags = 12 + children: + body = [ + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + SaveMethodBlockNode + attributes: + flags = 0 + slot = 3 + SaveMethodBlockNode + attributes: + flags = 0 + slot = 2 + NilLiteralNode + attributes: + flags = 0 + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/method_calls/parameter_forwarding/block_without_name.yaml b/spec/truffle/parsing/fixtures/method_calls/parameter_forwarding/block_without_name.yaml new file mode 100644 index 000000000000..1a677cfb5d76 --- /dev/null +++ b/spec/truffle/parsing/fixtures/method_calls/parameter_forwarding/block_without_name.yaml @@ -0,0 +1,95 @@ +subject: "Method call" +description: "parameter forwarding / block without name (&)" +notes: > + A local variable %forward_block is used to pass a block as a method call argument. +focused_on_node: "org.truffleruby.language.methods.LiteralMethodDefinitionNode" +ruby: | + def foo(&) + bar(&) + end +ast: | + LiteralMethodDefinitionNode + attributes: + callTargetSupplier = org.truffleruby.language.methods.CachedLazyCallTargetSupplier@... + flags = 1 + isDefSingleton = false + name = "foo" + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_block, type = block)]) + call targets: + RubyMethodRootNode + attributes: + arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false} + callTarget = Object#foo + checkArityProfile = false + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_block, #3:%method_block_arg} + instrumentationBits = 0 + keywordArguments = false + localReturnProfile = false + lock = java.util.concurrent.locks.ReentrantLock@...[Unlocked] + matchingReturnProfile = false + nonMatchingReturnProfile = false + polyglotRef = org.truffleruby.RubyLanguage@... + retryProfile = false + returnID = org.truffleruby.language.control.ReturnID@... + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_block, type = block)]) + split = HEURISTIC + children: + body = + SequenceNode + attributes: + flags = 12 + children: + body = [ + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + SaveMethodBlockNode + attributes: + flags = 0 + slot = 3 + SaveMethodBlockNode + attributes: + flags = 0 + slot = 2 + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 1 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "bar" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + block = + ToProcNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %forward_block + type = FRAME_LOCAL + receiver = + SelfNode + attributes: + flags = 0 + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/def/parameter_forwarding/forward_arguments.yaml b/spec/truffle/parsing/fixtures/method_calls/parameter_forwarding/forward_arguments.yaml similarity index 99% rename from spec/truffle/parsing/fixtures/def/parameter_forwarding/forward_arguments.yaml rename to spec/truffle/parsing/fixtures/method_calls/parameter_forwarding/forward_arguments.yaml index 9c992cfb918e..ba44ac4bf55e 100644 --- a/spec/truffle/parsing/fixtures/def/parameter_forwarding/forward_arguments.yaml +++ b/spec/truffle/parsing/fixtures/method_calls/parameter_forwarding/forward_arguments.yaml @@ -1,4 +1,4 @@ -subject: "Def" +subject: "Method call" description: "parameter forwarding / forward arguments (...)" notes: > Local variable %forward_rest, %forward_kwrest and %forward_block are used to pass parameters to a method call. diff --git a/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_anonymous_block_parameter.yaml b/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_anonymous_block_parameter.yaml new file mode 100644 index 000000000000..c474caa4b907 --- /dev/null +++ b/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_anonymous_block_parameter.yaml @@ -0,0 +1,87 @@ +subject: "Method call" +description: super / in a method body without explicit arguments when declared anonymous block parameters +notes: > + Is represented by SuperCallNode and ReadZSuperArgumentsNode nodes, + that read actual block from `%method_block_arg` variable. +focused_on_node: "org.truffleruby.language.methods.LiteralMethodDefinitionNode" +ruby: | + def foo(&) + super + end +ast: | + LiteralMethodDefinitionNode + attributes: + callTargetSupplier = org.truffleruby.language.methods.CachedLazyCallTargetSupplier@... + flags = 1 + isDefSingleton = false + name = "foo" + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_block, type = block)]) + call targets: + RubyMethodRootNode + attributes: + arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false} + callTarget = Object#foo + checkArityProfile = false + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:%forward_block, #3:%method_block_arg} + instrumentationBits = 0 + keywordArguments = false + localReturnProfile = false + lock = java.util.concurrent.locks.ReentrantLock@...[Unlocked] + matchingReturnProfile = false + nonMatchingReturnProfile = false + polyglotRef = org.truffleruby.RubyLanguage@... + retryProfile = false + returnID = org.truffleruby.language.control.ReturnID@... + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %forward_block, type = block)]) + split = HEURISTIC + children: + body = + SequenceNode + attributes: + flags = 12 + children: + body = [ + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + SaveMethodBlockNode + attributes: + flags = 0 + slot = 3 + SaveMethodBlockNode + attributes: + flags = 0 + slot = 2 + SuperCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + emptyKeywordsProfile = false + flags = 1 + isSplatted = false + lastArgIsNotHashProfile = false + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = + ReadZSuperArgumentsNode + attributes: + flags = 0 + restArgIndex = -1 + block = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %method_block_arg + type = FRAME_LOCAL + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_anonymous_rest_and_keyrest_parameters.yaml b/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_anonymous_rest_and_keyrest_parameters.yaml index 7296b6c9cc4e..466b9b42bd83 100644 --- a/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_anonymous_rest_and_keyrest_parameters.yaml +++ b/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_anonymous_rest_and_keyrest_parameters.yaml @@ -1,7 +1,8 @@ subject: "Method call" description: super / in a method body without explicit arguments when declared anonymous rest and keyrest parameters notes: > - Is represented by SuperCallNode and ReadZSuperArgumentsNode nodes + Is represented by SuperCallNode and ReadZSuperArgumentsNode nodes, + that read parameter values from `%unnamed_rest` and `%kwrest` local variables. focused_on_node: "org.truffleruby.language.methods.LiteralMethodDefinitionNode" ruby: | def foo(*, **) diff --git a/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java index 47f2197cc871..8a88202cd46b 100644 --- a/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java @@ -11,7 +11,6 @@ import java.util.Arrays; -import com.oracle.truffle.api.CompilerDirectives; import org.truffleruby.RubyLanguage; import org.truffleruby.annotations.Split; import org.truffleruby.language.RubyMethodRootNode; @@ -98,9 +97,7 @@ private void declareLocalVariables(Nodes.DefNode node) { switch (name) { case "*" -> environment.declareVar(TranslatorEnvironment.DEFAULT_REST_NAME); case "**" -> environment.declareVar(TranslatorEnvironment.DEFAULT_KEYWORD_REST_NAME); - case "&" -> - // we don't support yet Ruby 3.1's anonymous block parameter - throw CompilerDirectives.shouldNotReachHere("Anonymous block parameters aren't supported yet"); + case "&" -> environment.declareVar(TranslatorEnvironment.FORWARDED_BLOCK_NAME); case "..." -> { environment.declareVar(TranslatorEnvironment.FORWARDED_REST_NAME); environment.declareVar(TranslatorEnvironment.FORWARDED_KEYWORD_REST_NAME); diff --git a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java index 1899d61177f5..35770b963331 100644 --- a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java @@ -282,10 +282,16 @@ public RubyNode visitNoKeywordsParameterNode(Nodes.NoKeywordsParameterNode node) @Override public RubyNode visitBlockParameterNode(Nodes.BlockParameterNode node) { - // we don't support yet Ruby 3.1's anonymous block parameter - assert node.name != null; + final String name; - final int slot = environment.findFrameSlot(node.name); + if (node.name == null) { + // def a(&) + name = TranslatorEnvironment.FORWARDED_BLOCK_NAME; + } else { + name = node.name; + } + + final int slot = environment.findFrameSlot(name); return new SaveMethodBlockNode(slot); } diff --git a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java index c2db90df6896..7743443555ee 100644 --- a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java @@ -29,10 +29,16 @@ import org.truffleruby.language.methods.Arity; -// Translates Nodes.ParametersNode in a proc node -// Destructures a Proc's single Array argument -// -// Based on org.truffleruby.parser.YARPLoadArgumentsTranslator (logic when useArray() -> true) +/** Translates block's Nodes.ParametersNode to destructure a block's single Array argument. + * + * When a block is called with a single argument that is Array (or could be converted to Array), this array is + * destructured and its elements are assigned to a block parameters (that is similar to multi-assignment): + * + * 
+ *   proc { |a, *b| [a, b] }.call([1, 2, 3]) # => [1, [2, 3]]
+ *
+ * + * Based on org.truffleruby.parser.YARPLoadArgumentsTranslator */ public final class YARPParametersNodeToDestructureTranslator extends AbstractNodeVisitor { private final Nodes.ParametersNode parameters; @@ -209,9 +215,16 @@ public RubyNode visitNoKeywordsParameterNode(Nodes.NoKeywordsParameterNode node) @Override public RubyNode visitBlockParameterNode(Nodes.BlockParameterNode node) { - assert node.name != null; // we don't support yet Ruby 3.1's anonymous block parameter + final String name; - final int slot = environment.findFrameSlot(node.name); + if (node.name == null) { + // def a(&) + name = TranslatorEnvironment.FORWARDED_BLOCK_NAME; + } else { + name = node.name; + } + + final int slot = environment.findFrameSlot(name); return new SaveMethodBlockNode(slot); } diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index f4166666989e..cc1ad450fbe4 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -567,11 +567,19 @@ private RubyNode translateBlockAndLambda(Nodes.Node node, Nodes.Node parametersN @Override public RubyNode visitBlockArgumentNode(Nodes.BlockArgumentNode node) { - // def a(&) b(&) end - assert node.expression != null; // Ruby 3.1's anonymous block parameter, that we don't support yet + final RubyNode rubyNode; + final RubyNode valueNode; + + if (node.expression == null) { + // def foo(&) a(&) end + valueNode = environment.findLocalVarNode(FORWARDED_BLOCK_NAME, null); + assert valueNode != null : "block forwarding local variable should be declared"; + } else { + // a(&:b) + valueNode = node.expression.accept(this); + } - // a(&:b) - RubyNode rubyNode = ToProcNodeGen.create(node.expression.accept(this)); + rubyNode = ToProcNodeGen.create(valueNode); return assignPositionAndFlags(node, rubyNode); } @@ -3709,9 +3717,16 @@ private ArgumentDescriptor[] parametersNodeToArgumentDescriptors(Nodes.Parameter } if (parametersNode.block != null) { - // we don't support yet Ruby 3.1's anonymous block parameter - assert parametersNode.block.name != null; - descriptors.add(new ArgumentDescriptor(ArgumentType.block, parametersNode.block.name)); + final String name; + + if (parametersNode.block.name == null) { + // def a(&) ... end + name = FORWARDED_BLOCK_NAME; + } else { + name = parametersNode.block.name; + } + + descriptors.add(new ArgumentDescriptor(ArgumentType.block, name)); } return descriptors.toArray(ArgumentDescriptor.EMPTY_ARRAY); From 2aecda96e1eb24da82d25b336e316a896cf94c6c Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 28 Dec 2023 13:26:39 +0200 Subject: [PATCH 008/131] Fix translation of for-loop with empty body --- .../org/truffleruby/parser/YARPTranslator.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index cc1ad450fbe4..c5a2edeb5c36 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -1695,12 +1695,20 @@ public RubyNode visitForNode(Nodes.ForNode node) { throw CompilerDirectives.shouldNotReachHere("Unexpected node class for for-loop index"); } - Nodes.Node[] statements = new Nodes.Node[node.statements.body.length + 1]; - System.arraycopy(node.statements.body, 0, statements, 1, node.statements.body.length); - statements[0] = writeIndex; + final Nodes.Node body; + + if (node.statements != null) { + Nodes.Node[] statements = new Nodes.Node[1 + node.statements.body.length]; + statements[0] = writeIndex; + System.arraycopy(node.statements.body, 0, statements, 1, node.statements.body.length); + + body = new Nodes.StatementsNode(statements, node.statements.startOffset, node.statements.length); + } else { + // for loop with empty body + var statements = new Nodes.Node[]{ writeIndex }; + body = new Nodes.StatementsNode(statements, 0, 0); + } - final Nodes.Node body = new Nodes.StatementsNode(statements, node.statements.startOffset, - node.statements.length); // in the block environment declare local variable only for parameter // and skip declaration all the local variables defined in the block String[] locals = new String[]{ parameterName }; From 0ae851d9a26c2e69944783df977cbcd8e61d012b Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 28 Dec 2023 16:28:52 +0200 Subject: [PATCH 009/131] Fix source location for manually created Prism nodes --- src/main/java/org/truffleruby/parser/YARPTranslator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index c5a2edeb5c36..1fb551a068f5 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -1233,7 +1233,7 @@ public RubyNode visitConstantPathAndWriteNode(Nodes.ConstantPathAndWriteNode nod var parentExpression = new YARPExecutedOnceExpression("value", node.target.parent, this); Nodes.Node readParent = parentExpression.getReadYARPNode(); target = new Nodes.ConstantPathNode(readParent, node.target.child, node.target.startOffset, - node.target.startOffset); + node.target.length); writeParentNode = parentExpression.getWriteNode(); } else { @@ -1297,7 +1297,7 @@ public RubyNode visitConstantPathOperatorWriteNode(Nodes.ConstantPathOperatorWri var parentExpression = new YARPExecutedOnceExpression("value", node.target.parent, this); Nodes.Node readParent = parentExpression.getReadYARPNode(); target = new Nodes.ConstantPathNode(readParent, node.target.child, node.target.startOffset, - node.target.startOffset); + node.target.length); writeParentNode = parentExpression.getWriteNode(); } else { @@ -1340,7 +1340,7 @@ public RubyNode visitConstantPathOrWriteNode(Nodes.ConstantPathOrWriteNode node) var parentExpression = new YARPExecutedOnceExpression("value", node.target.parent, this); Nodes.Node readParent = parentExpression.getReadYARPNode(); target = new Nodes.ConstantPathNode(readParent, node.target.child, node.target.startOffset, - node.target.startOffset); + node.target.length); writeParentNode = parentExpression.getWriteNode(); } else { From 9e23fbbb4f5263ede1eedfb6bfb10b80b0a47f6c Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 28 Dec 2023 17:44:45 +0200 Subject: [PATCH 010/131] Add YAML fixtures for embedded in String, Symbol and Regexp variables --- .../regexps/with_embedded_class_variable.yaml | 55 +++++++++++++++++++ .../with_embedded_global_variable.yaml | 51 +++++++++++++++++ .../with_embedded_instance_variable.yaml | 50 +++++++++++++++++ .../strings/with_embedded_class_variable.yaml | 39 +++++++++++++ .../with_embedded_global_variable.yaml | 35 ++++++++++++ .../with_embedded_instance_variable.yaml | 34 ++++++++++++ .../symbols/with_embedded_class_variable.yaml | 44 +++++++++++++++ .../with_embedded_global_variable.yaml | 40 ++++++++++++++ .../with_embedded_instance_variable.yaml | 39 +++++++++++++ 9 files changed, 387 insertions(+) create mode 100644 spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml create mode 100644 spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml create mode 100644 spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml create mode 100644 spec/truffle/parsing/fixtures/strings/with_embedded_class_variable.yaml create mode 100644 spec/truffle/parsing/fixtures/strings/with_embedded_global_variable.yaml create mode 100644 spec/truffle/parsing/fixtures/strings/with_embedded_instance_variable.yaml create mode 100644 spec/truffle/parsing/fixtures/symbols/with_embedded_class_variable.yaml create mode 100644 spec/truffle/parsing/fixtures/symbols/with_embedded_global_variable.yaml create mode 100644 spec/truffle/parsing/fixtures/symbols/with_embedded_instance_variable.yaml diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml new file mode 100644 index 000000000000..866ed2dad3d3 --- /dev/null +++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml @@ -0,0 +1,55 @@ +subject: "Regexp" +description: "with embedded class variable (#@@a)" +focused_on_node: "org.truffleruby.core.regexp.InterpolatedRegexpNode" +ruby: | + /foo #@@bar/ +ast: | + InterpolatedRegexpNode + attributes: + flags = 1 + rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@... + children: + asTruffleStringNode = + TruffleStringFactory$AsTruffleStringNodeGen + builderNode = + InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen + attributes: + options = RegexpOptions(kcode: NONE, kcodeDefault) + children: + equalNode = + TruffleStringFactory$EqualNodeGen + children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = ASCII-8BIT + flags = 0 + tstring = "" + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = UTF-8 + flags = 0 + tstring = foo + ToSNodeGen + children: + valueNode_ = + ReadClassVariableNode + attributes: + flags = 0 + name = "@@bar" + children: + lexicalScopeNode = + ObjectLiteralNode + attributes: + flags = 0 + object = :: Object + lookupClassVariableNode = + LookupClassVariableNodeGen + resolveTargetModuleNode = + ResolveTargetModuleForClassVariablesNodeGen + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml new file mode 100644 index 000000000000..e71d0d021450 --- /dev/null +++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml @@ -0,0 +1,51 @@ +subject: "Regexp" +description: "with embedded global variable (#$a)" +focused_on_node: "org.truffleruby.core.regexp.InterpolatedRegexpNode" +ruby: | + /foo #$bar/ +ast: | + InterpolatedRegexpNode + attributes: + flags = 1 + rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@... + children: + asTruffleStringNode = + TruffleStringFactory$AsTruffleStringNodeGen + builderNode = + InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen + attributes: + options = RegexpOptions(kcode: NONE, kcodeDefault) + children: + equalNode = + TruffleStringFactory$EqualNodeGen + children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = ASCII-8BIT + flags = 0 + tstring = "" + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = UTF-8 + flags = 0 + tstring = foo + ToSNodeGen + children: + valueNode_ = + ReadGlobalVariableNodeGen + attributes: + flags = 0 + name = "$bar" + children: + lookupGlobalVariableStorageNode = + LookupGlobalVariableStorageNodeGen + attributes: + index = -1 + name = "$bar" + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml new file mode 100644 index 000000000000..afbfe7bb065d --- /dev/null +++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml @@ -0,0 +1,50 @@ +subject: "Regexp" +description: "with embedded instance variable (#@a)" +focused_on_node: "org.truffleruby.core.regexp.InterpolatedRegexpNode" +ruby: | + /foo #@bar/ +ast: | + InterpolatedRegexpNode + attributes: + flags = 1 + rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@... + children: + asTruffleStringNode = + TruffleStringFactory$AsTruffleStringNodeGen + builderNode = + InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen + attributes: + options = RegexpOptions(kcode: NONE, kcodeDefault) + children: + equalNode = + TruffleStringFactory$EqualNodeGen + children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = ASCII-8BIT + flags = 0 + tstring = "" + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = UTF-8 + flags = 0 + tstring = foo + ToSNodeGen + children: + valueNode_ = + ReadInstanceVariableNode + attributes: + flags = 0 + name = "@bar" + children: + readSelfSlotNode = + ReadFrameSlotNodeGen + attributes: + frameSlot = 0 # (self) + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/strings/with_embedded_class_variable.yaml b/spec/truffle/parsing/fixtures/strings/with_embedded_class_variable.yaml new file mode 100644 index 000000000000..30b1c8d6602b --- /dev/null +++ b/spec/truffle/parsing/fixtures/strings/with_embedded_class_variable.yaml @@ -0,0 +1,39 @@ +subject: "String" +description: "with embedded class variable (#@@a)" +focused_on_node: "org.truffleruby.core.string.InterpolatedStringNode" +ruby: | + "foo #@@bar" +ast: | + InterpolatedStringNode + attributes: + emptyTString = "" + encoding = UTF-8 + flags = 1 + children: + children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = UTF-8 + flags = 0 + tstring = foo + ToSNodeGen + children: + valueNode_ = + ReadClassVariableNode + attributes: + flags = 0 + name = "@@bar" + children: + lexicalScopeNode = + ObjectLiteralNode + attributes: + flags = 0 + object = :: Object + lookupClassVariableNode = + LookupClassVariableNodeGen + resolveTargetModuleNode = + ResolveTargetModuleForClassVariablesNodeGen + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/strings/with_embedded_global_variable.yaml b/spec/truffle/parsing/fixtures/strings/with_embedded_global_variable.yaml new file mode 100644 index 000000000000..dfcd18a15988 --- /dev/null +++ b/spec/truffle/parsing/fixtures/strings/with_embedded_global_variable.yaml @@ -0,0 +1,35 @@ +subject: "String" +description: "with embedded global variable (#$a)" +focused_on_node: "org.truffleruby.core.string.InterpolatedStringNode" +ruby: | + "foo #$bar" +ast: | + InterpolatedStringNode + attributes: + emptyTString = "" + encoding = UTF-8 + flags = 1 + children: + children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = UTF-8 + flags = 0 + tstring = foo + ToSNodeGen + children: + valueNode_ = + ReadGlobalVariableNodeGen + attributes: + flags = 0 + name = "$bar" + children: + lookupGlobalVariableStorageNode = + LookupGlobalVariableStorageNodeGen + attributes: + index = -1 + name = "$bar" + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/strings/with_embedded_instance_variable.yaml b/spec/truffle/parsing/fixtures/strings/with_embedded_instance_variable.yaml new file mode 100644 index 000000000000..09b2a4e35295 --- /dev/null +++ b/spec/truffle/parsing/fixtures/strings/with_embedded_instance_variable.yaml @@ -0,0 +1,34 @@ +subject: "String" +description: "with embedded instance variable (#@a)" +focused_on_node: "org.truffleruby.core.string.InterpolatedStringNode" +ruby: | + "foo #@bar" +ast: | + InterpolatedStringNode + attributes: + emptyTString = "" + encoding = UTF-8 + flags = 1 + children: + children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = UTF-8 + flags = 0 + tstring = foo + ToSNodeGen + children: + valueNode_ = + ReadInstanceVariableNode + attributes: + flags = 0 + name = "@bar" + children: + readSelfSlotNode = + ReadFrameSlotNodeGen + attributes: + frameSlot = 0 # (self) + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/symbols/with_embedded_class_variable.yaml b/spec/truffle/parsing/fixtures/symbols/with_embedded_class_variable.yaml new file mode 100644 index 000000000000..5c660d81d050 --- /dev/null +++ b/spec/truffle/parsing/fixtures/symbols/with_embedded_class_variable.yaml @@ -0,0 +1,44 @@ +subject: "Symbol" +description: "with embedded class variable (#@@a)" +focused_on_node: "org.truffleruby.core.cast.StringToSymbolNodeGen" +ruby: | + :"foo #@@bar" +ast: | + StringToSymbolNodeGen + attributes: + flags = 1 + children: + stringNode_ = + InterpolatedStringNode + attributes: + emptyTString = "" + encoding = UTF-8 + flags = 0 + children: + children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = UTF-8 + flags = 0 + tstring = foo + ToSNodeGen + children: + valueNode_ = + ReadClassVariableNode + attributes: + flags = 0 + name = "@@bar" + children: + lexicalScopeNode = + ObjectLiteralNode + attributes: + flags = 0 + object = :: Object + lookupClassVariableNode = + LookupClassVariableNodeGen + resolveTargetModuleNode = + ResolveTargetModuleForClassVariablesNodeGen + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/symbols/with_embedded_global_variable.yaml b/spec/truffle/parsing/fixtures/symbols/with_embedded_global_variable.yaml new file mode 100644 index 000000000000..6f34dd035cea --- /dev/null +++ b/spec/truffle/parsing/fixtures/symbols/with_embedded_global_variable.yaml @@ -0,0 +1,40 @@ +subject: "Symbol" +description: "with embedded global variable (#$a)" +focused_on_node: "org.truffleruby.core.cast.StringToSymbolNodeGen" +ruby: | + :"foo #$bar" +ast: | + StringToSymbolNodeGen + attributes: + flags = 1 + children: + stringNode_ = + InterpolatedStringNode + attributes: + emptyTString = "" + encoding = UTF-8 + flags = 0 + children: + children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = UTF-8 + flags = 0 + tstring = foo + ToSNodeGen + children: + valueNode_ = + ReadGlobalVariableNodeGen + attributes: + flags = 0 + name = "$bar" + children: + lookupGlobalVariableStorageNode = + LookupGlobalVariableStorageNodeGen + attributes: + index = -1 + name = "$bar" + ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/symbols/with_embedded_instance_variable.yaml b/spec/truffle/parsing/fixtures/symbols/with_embedded_instance_variable.yaml new file mode 100644 index 000000000000..c36e245b351e --- /dev/null +++ b/spec/truffle/parsing/fixtures/symbols/with_embedded_instance_variable.yaml @@ -0,0 +1,39 @@ +subject: "Symbol" +description: "with embedded instance variable (#@a)" +focused_on_node: "org.truffleruby.core.cast.StringToSymbolNodeGen" +ruby: | + :"foo #@bar" +ast: | + StringToSymbolNodeGen + attributes: + flags = 1 + children: + stringNode_ = + InterpolatedStringNode + attributes: + emptyTString = "" + encoding = UTF-8 + flags = 0 + children: + children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = UTF-8 + flags = 0 + tstring = foo + ToSNodeGen + children: + valueNode_ = + ReadInstanceVariableNode + attributes: + flags = 0 + name = "@bar" + children: + readSelfSlotNode = + ReadFrameSlotNodeGen + attributes: + frameSlot = 0 # (self) + ] \ No newline at end of file From 398787e27109e82912ed5d417889bb85889902ae Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 28 Dec 2023 18:02:16 +0200 Subject: [PATCH 011/131] Translate EmbeddedVariableNode --- .../regexps/with_embedded_class_variable.yaml | 15 ++++----------- .../regexps/with_embedded_global_variable.yaml | 15 ++++----------- .../regexps/with_embedded_instance_variable.yaml | 15 ++++----------- .../strings/with_embedded_class_variable.yaml | 4 ++-- .../strings/with_embedded_global_variable.yaml | 4 ++-- .../strings/with_embedded_instance_variable.yaml | 4 ++-- .../symbols/with_embedded_class_variable.yaml | 4 ++-- .../symbols/with_embedded_global_variable.yaml | 4 ++-- .../symbols/with_embedded_instance_variable.yaml | 4 ++-- .../org/truffleruby/parser/YARPTranslator.java | 4 ++-- 10 files changed, 26 insertions(+), 47 deletions(-) diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml index 866ed2dad3d3..078606a7f84c 100644 --- a/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml +++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml @@ -1,12 +1,13 @@ subject: "Regexp" description: "with embedded class variable (#@@a)" +yarp_specific: true # there was an extra "" StringLiteralNode and RegexpOptions didn't have a 'literal' property focused_on_node: "org.truffleruby.core.regexp.InterpolatedRegexpNode" ruby: | /foo #@@bar/ ast: | InterpolatedRegexpNode attributes: - flags = 1 + flags = 0 rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@... children: asTruffleStringNode = @@ -14,26 +15,18 @@ ast: | builderNode = InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen attributes: - options = RegexpOptions(kcode: NONE, kcodeDefault) + options = RegexpOptions(kcode: NONE, kcodeDefault, literal) children: equalNode = TruffleStringFactory$EqualNodeGen children = [ - ToSNodeGen - children: - valueNode_ = - StringLiteralNode - attributes: - encoding = ASCII-8BIT - flags = 0 - tstring = "" ToSNodeGen children: valueNode_ = StringLiteralNode attributes: encoding = UTF-8 - flags = 0 + flags = 1 tstring = foo ToSNodeGen children: diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml index e71d0d021450..62d043654413 100644 --- a/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml +++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml @@ -1,12 +1,13 @@ subject: "Regexp" description: "with embedded global variable (#$a)" +yarp_specific: true # there was an extra "" StringLiteralNode and RegexpOptions didn't have a 'literal' property focused_on_node: "org.truffleruby.core.regexp.InterpolatedRegexpNode" ruby: | /foo #$bar/ ast: | InterpolatedRegexpNode attributes: - flags = 1 + flags = 0 rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@... children: asTruffleStringNode = @@ -14,26 +15,18 @@ ast: | builderNode = InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen attributes: - options = RegexpOptions(kcode: NONE, kcodeDefault) + options = RegexpOptions(kcode: NONE, kcodeDefault, literal) children: equalNode = TruffleStringFactory$EqualNodeGen children = [ - ToSNodeGen - children: - valueNode_ = - StringLiteralNode - attributes: - encoding = ASCII-8BIT - flags = 0 - tstring = "" ToSNodeGen children: valueNode_ = StringLiteralNode attributes: encoding = UTF-8 - flags = 0 + flags = 1 tstring = foo ToSNodeGen children: diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml index afbfe7bb065d..99a2c527dcef 100644 --- a/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml +++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml @@ -1,12 +1,13 @@ subject: "Regexp" description: "with embedded instance variable (#@a)" +yarp_specific: true # there was an extra "" StringLiteralNode and RegexpOptions didn't have a 'literal' property focused_on_node: "org.truffleruby.core.regexp.InterpolatedRegexpNode" ruby: | /foo #@bar/ ast: | InterpolatedRegexpNode attributes: - flags = 1 + flags = 0 rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@... children: asTruffleStringNode = @@ -14,26 +15,18 @@ ast: | builderNode = InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen attributes: - options = RegexpOptions(kcode: NONE, kcodeDefault) + options = RegexpOptions(kcode: NONE, kcodeDefault, literal) children: equalNode = TruffleStringFactory$EqualNodeGen children = [ - ToSNodeGen - children: - valueNode_ = - StringLiteralNode - attributes: - encoding = ASCII-8BIT - flags = 0 - tstring = "" ToSNodeGen children: valueNode_ = StringLiteralNode attributes: encoding = UTF-8 - flags = 0 + flags = 1 tstring = foo ToSNodeGen children: diff --git a/spec/truffle/parsing/fixtures/strings/with_embedded_class_variable.yaml b/spec/truffle/parsing/fixtures/strings/with_embedded_class_variable.yaml index 30b1c8d6602b..562a36a33c29 100644 --- a/spec/truffle/parsing/fixtures/strings/with_embedded_class_variable.yaml +++ b/spec/truffle/parsing/fixtures/strings/with_embedded_class_variable.yaml @@ -8,7 +8,7 @@ ast: | attributes: emptyTString = "" encoding = UTF-8 - flags = 1 + flags = 0 children: children = [ ToSNodeGen @@ -17,7 +17,7 @@ ast: | StringLiteralNode attributes: encoding = UTF-8 - flags = 0 + flags = 1 tstring = foo ToSNodeGen children: diff --git a/spec/truffle/parsing/fixtures/strings/with_embedded_global_variable.yaml b/spec/truffle/parsing/fixtures/strings/with_embedded_global_variable.yaml index dfcd18a15988..88b0c2395958 100644 --- a/spec/truffle/parsing/fixtures/strings/with_embedded_global_variable.yaml +++ b/spec/truffle/parsing/fixtures/strings/with_embedded_global_variable.yaml @@ -8,7 +8,7 @@ ast: | attributes: emptyTString = "" encoding = UTF-8 - flags = 1 + flags = 0 children: children = [ ToSNodeGen @@ -17,7 +17,7 @@ ast: | StringLiteralNode attributes: encoding = UTF-8 - flags = 0 + flags = 1 tstring = foo ToSNodeGen children: diff --git a/spec/truffle/parsing/fixtures/strings/with_embedded_instance_variable.yaml b/spec/truffle/parsing/fixtures/strings/with_embedded_instance_variable.yaml index 09b2a4e35295..53c1ff5bb12a 100644 --- a/spec/truffle/parsing/fixtures/strings/with_embedded_instance_variable.yaml +++ b/spec/truffle/parsing/fixtures/strings/with_embedded_instance_variable.yaml @@ -8,7 +8,7 @@ ast: | attributes: emptyTString = "" encoding = UTF-8 - flags = 1 + flags = 0 children: children = [ ToSNodeGen @@ -17,7 +17,7 @@ ast: | StringLiteralNode attributes: encoding = UTF-8 - flags = 0 + flags = 1 tstring = foo ToSNodeGen children: diff --git a/spec/truffle/parsing/fixtures/symbols/with_embedded_class_variable.yaml b/spec/truffle/parsing/fixtures/symbols/with_embedded_class_variable.yaml index 5c660d81d050..3d6236fe1d0d 100644 --- a/spec/truffle/parsing/fixtures/symbols/with_embedded_class_variable.yaml +++ b/spec/truffle/parsing/fixtures/symbols/with_embedded_class_variable.yaml @@ -6,7 +6,7 @@ ruby: | ast: | StringToSymbolNodeGen attributes: - flags = 1 + flags = 0 children: stringNode_ = InterpolatedStringNode @@ -22,7 +22,7 @@ ast: | StringLiteralNode attributes: encoding = UTF-8 - flags = 0 + flags = 1 tstring = foo ToSNodeGen children: diff --git a/spec/truffle/parsing/fixtures/symbols/with_embedded_global_variable.yaml b/spec/truffle/parsing/fixtures/symbols/with_embedded_global_variable.yaml index 6f34dd035cea..c752a8887798 100644 --- a/spec/truffle/parsing/fixtures/symbols/with_embedded_global_variable.yaml +++ b/spec/truffle/parsing/fixtures/symbols/with_embedded_global_variable.yaml @@ -6,7 +6,7 @@ ruby: | ast: | StringToSymbolNodeGen attributes: - flags = 1 + flags = 0 children: stringNode_ = InterpolatedStringNode @@ -22,7 +22,7 @@ ast: | StringLiteralNode attributes: encoding = UTF-8 - flags = 0 + flags = 1 tstring = foo ToSNodeGen children: diff --git a/spec/truffle/parsing/fixtures/symbols/with_embedded_instance_variable.yaml b/spec/truffle/parsing/fixtures/symbols/with_embedded_instance_variable.yaml index c36e245b351e..46b453b81336 100644 --- a/spec/truffle/parsing/fixtures/symbols/with_embedded_instance_variable.yaml +++ b/spec/truffle/parsing/fixtures/symbols/with_embedded_instance_variable.yaml @@ -6,7 +6,7 @@ ruby: | ast: | StringToSymbolNodeGen attributes: - flags = 1 + flags = 0 children: stringNode_ = InterpolatedStringNode @@ -22,7 +22,7 @@ ast: | StringLiteralNode attributes: encoding = UTF-8 - flags = 0 + flags = 1 tstring = foo ToSNodeGen children: diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 1fb551a068f5..9270b786569d 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -1526,8 +1526,8 @@ public RubyNode visitElseNode(Nodes.ElseNode node) { @Override public RubyNode visitEmbeddedStatementsNode(Nodes.EmbeddedStatementsNode node) { - // empty interpolation expression, e.g. in "a #{} b" if (node.statements == null) { + // empty interpolation expression, e.g. in "a #{} b" RubyNode rubyNode = new ObjectLiteralNode( language.getFrozenStringLiteral(sourceEncoding.tencoding.getEmpty(), sourceEncoding)); return assignPositionAndFlags(node, rubyNode); @@ -1538,7 +1538,7 @@ public RubyNode visitEmbeddedStatementsNode(Nodes.EmbeddedStatementsNode node) { @Override public RubyNode visitEmbeddedVariableNode(Nodes.EmbeddedVariableNode node) { - return defaultVisit(node); + return node.variable.accept(this); } @Override From 6ec9afe320d3aee719ec4727a9c38298558e8535 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 28 Dec 2023 18:38:43 +0200 Subject: [PATCH 012/131] Add YAML fixture for implicit rest in nested multi-assignment --- .../when_implicit_rest.yaml | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 spec/truffle/parsing/fixtures/operators/multi_assignments/nested_multi_assignment/when_implicit_rest.yaml diff --git a/spec/truffle/parsing/fixtures/operators/multi_assignments/nested_multi_assignment/when_implicit_rest.yaml b/spec/truffle/parsing/fixtures/operators/multi_assignments/nested_multi_assignment/when_implicit_rest.yaml new file mode 100644 index 000000000000..fe338202b8c6 --- /dev/null +++ b/spec/truffle/parsing/fixtures/operators/multi_assignments/nested_multi_assignment/when_implicit_rest.yaml @@ -0,0 +1,45 @@ +subject: "Multi-assignment" +description: "When nested multi assignment / when implicit rest ((a,) = [])" +notes: > + Implicit rest is just ignored +focused_on_node: "org.truffleruby.core.array.MultipleAssignmentNode" +ruby: | + (a,), b = [] +ast: | + MultipleAssignmentNode + attributes: + flags = 1 + children: + preNodes = [ + MultipleAssignmentNode + attributes: + flags = 0 + children: + preNodes = [ + WriteFrameSlotNodeGen + attributes: + frameSlot = 2 # a + ] + splatCastNode = + SplatCastNodeGen + attributes: + conversionMethod = :to_ary + copy = true + flags = 0 + nilBehavior = ARRAY_WITH_NIL + WriteFrameSlotNodeGen + attributes: + frameSlot = 3 # b + ] + rhsNode = + ArrayLiteralNode$UninitialisedArrayLiteralNode + attributes: + flags = 0 + language = org.truffleruby.RubyLanguage@... + splatCastNode = + SplatCastNodeGen + attributes: + conversionMethod = :to_ary + copy = true + flags = 0 + nilBehavior = ARRAY_WITH_NIL \ No newline at end of file From 16b783f1f5b870412b775bad1d537cc49e989fec Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 28 Dec 2023 18:39:08 +0200 Subject: [PATCH 013/131] Translate ImplicitRest node in nested multi-assignment --- .../parser/YARPMultiTargetNodeTranslator.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/truffleruby/parser/YARPMultiTargetNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPMultiTargetNodeTranslator.java index cf718fe05549..0a2088419b1a 100644 --- a/src/main/java/org/truffleruby/parser/YARPMultiTargetNodeTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPMultiTargetNodeTranslator.java @@ -9,6 +9,7 @@ */ package org.truffleruby.parser; +import com.oracle.truffle.api.CompilerDirectives; import org.prism.AbstractNodeVisitor; import org.prism.Nodes; import org.truffleruby.RubyLanguage; @@ -63,7 +64,14 @@ public MultipleAssignmentNode translate() { final AssignableNode restNode; if (node.rest != null) { - restNode = node.rest.accept(this); + // implicit rest in nested target is allowed only for multi-assignment and isn't allowed in block parameters + if (node.rest instanceof Nodes.ImplicitRestNode) { + // a, = [] + // do nothing + restNode = null; + } else { + restNode = node.rest.accept(this); + } } else { restNode = null; } @@ -112,6 +120,11 @@ public AssignableNode visitGlobalVariableTargetNode(Nodes.GlobalVariableTargetNo return ((AssignableNode) rubyNode).toAssignableNode(); } + @Override + public AssignableNode visitImplicitRestNode(Nodes.ImplicitRestNode node) { + throw CompilerDirectives.shouldNotReachHere("handled in #translate"); + } + @Override public AssignableNode visitIndexTargetNode(Nodes.IndexTargetNode node) { final RubyNode rubyNode = node.accept(yarpTranslator); From e1a81e2d588663cc30a4b1e0ab8606156bf1deb7 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Fri, 29 Dec 2023 20:21:44 +0200 Subject: [PATCH 014/131] Fix translation of ||= and undefined fully qualified constant --- .../constant_fully_qualified.yaml | 34 +++++++++++++++---- .../truffleruby/parser/YARPTranslator.java | 3 +- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/spec/truffle/parsing/fixtures/operators/||=/variable_assignments/constant_fully_qualified.yaml b/spec/truffle/parsing/fixtures/operators/||=/variable_assignments/constant_fully_qualified.yaml index 62ed1e497612..c5255aa72179 100644 --- a/spec/truffle/parsing/fixtures/operators/||=/variable_assignments/constant_fully_qualified.yaml +++ b/spec/truffle/parsing/fixtures/operators/||=/variable_assignments/constant_fully_qualified.yaml @@ -61,17 +61,39 @@ ast: | flags = 0 children: left = - ReadConstantNode + AndNodeGen attributes: flags = 0 - name = "BAR" children: - moduleNode = - ReadLocalVariableNode + left = + DefinedNode attributes: flags = 0 - frameSlot = 2 # %value_0 - type = FRAME_LOCAL + children: + child = + ReadConstantNode + attributes: + flags = 0 + name = "BAR" + children: + moduleNode = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %value_0 + type = FRAME_LOCAL + right = + ReadConstantNode + attributes: + flags = 0 + name = "BAR" + children: + moduleNode = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %value_0 + type = FRAME_LOCAL right = WriteConstantNode attributes: diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 9270b786569d..c609243374aa 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -1353,7 +1353,8 @@ public RubyNode visitConstantPathOrWriteNode(Nodes.ConstantPathOrWriteNode node) var readNode = (ReadConstantNode) target.accept(this); var writeNode = (WriteConstantNode) readNode.makeWriteNode(value); - final RubyNode orNode = OrNodeGen.create(readNode, writeNode); + var andNode = AndNodeGen.create(new DefinedNode(readNode), readNode); + final RubyNode orNode = OrNodeGen.create(andNode, writeNode); final RubyNode rubyNode; From 044920bbadf454613c28a3ebe270a0e69cd601a0 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Wed, 3 Jan 2024 17:17:26 +0200 Subject: [PATCH 015/131] Set proper source encoding --- .../strings/with_magic_encoding_comment.yaml | 14 ++++++++++++++ .../java/org/truffleruby/parser/RubySource.java | 2 +- .../parser/YARPBlockNodeTranslator.java | 4 +++- .../truffleruby/parser/YARPDefNodeTranslator.java | 4 +++- .../org/truffleruby/parser/YARPTranslator.java | 12 +++++++++++- .../truffleruby/parser/YARPTranslatorDriver.java | 5 +++++ 6 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 spec/truffle/parsing/fixtures/strings/with_magic_encoding_comment.yaml diff --git a/spec/truffle/parsing/fixtures/strings/with_magic_encoding_comment.yaml b/spec/truffle/parsing/fixtures/strings/with_magic_encoding_comment.yaml new file mode 100644 index 000000000000..3d8fc2de6f28 --- /dev/null +++ b/spec/truffle/parsing/fixtures/strings/with_magic_encoding_comment.yaml @@ -0,0 +1,14 @@ +subject: "String" +description: "with magic encoding comment (# encoding: ...)" +notes: > + It assigns a String literal specified encoding as `encoding = Big5` +focused_on_node: "org.truffleruby.language.literal.StringLiteralNode" +ruby: | + # encoding: BIG5 + "foobar" +ast: | + StringLiteralNode + attributes: + encoding = Big5 + flags = 1 + tstring = foobar \ No newline at end of file diff --git a/src/main/java/org/truffleruby/parser/RubySource.java b/src/main/java/org/truffleruby/parser/RubySource.java index 15651664baf5..50bd399a40cd 100644 --- a/src/main/java/org/truffleruby/parser/RubySource.java +++ b/src/main/java/org/truffleruby/parser/RubySource.java @@ -30,7 +30,7 @@ public final class RubySource { private final Source source; - /** The path that will be used by the parser for __FILE__, warnings and syntax errors. Currently the same as + /** The path that will be used by the parser for __FILE__, warnings and syntax errors. Currently, the same as * {@link RubyLanguage#getPath(Source)}. Kept separate as we might want to change Source#getName() for non-file * Sources in the future (but then we'll need to still use this path in Ruby backtraces). */ private final String sourcePath; diff --git a/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java index f4eae9cd797a..ff42a5bb3017 100644 --- a/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java @@ -20,6 +20,7 @@ import org.truffleruby.core.IsNilNode; import org.truffleruby.core.cast.SplatCastNode; import org.truffleruby.core.cast.SplatCastNodeGen; +import org.truffleruby.core.encoding.RubyEncoding; import org.truffleruby.core.proc.ProcCallTargets; import org.truffleruby.core.proc.ProcType; import org.truffleruby.language.RubyLambdaRootNode; @@ -51,10 +52,11 @@ public YARPBlockNodeTranslator( TranslatorEnvironment environment, byte[] sourceBytes, Source source, + RubyEncoding sourceEncoding, ParserContext parserContext, Node currentNode, Arity arity) { - super(language, environment, sourceBytes, source, parserContext, currentNode); + super(language, environment, sourceBytes, source, sourceEncoding, parserContext, currentNode); this.arity = arity; } diff --git a/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java index 8a88202cd46b..54ced7ba3495 100644 --- a/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java @@ -13,6 +13,7 @@ import org.truffleruby.RubyLanguage; import org.truffleruby.annotations.Split; +import org.truffleruby.core.encoding.RubyEncoding; import org.truffleruby.language.RubyMethodRootNode; import org.truffleruby.language.RubyNode; import org.truffleruby.language.methods.Arity; @@ -30,9 +31,10 @@ public YARPDefNodeTranslator( TranslatorEnvironment environment, byte[] sourceBytes, Source source, + RubyEncoding sourceEncoding, ParserContext parserContext, Node currentNode) { - super(language, environment, sourceBytes, source, parserContext, currentNode); + super(language, environment, sourceBytes, source, sourceEncoding, parserContext, currentNode); if (parserContext.isEval() || environment.getParseEnvironment().isCoverageEnabled()) { shouldLazyTranslate = false; diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index c609243374aa..409a3972c293 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -224,15 +224,22 @@ public YARPTranslator( TranslatorEnvironment environment, byte[] sourceBytes, Source source, + RubyEncoding sourceEncoding, ParserContext parserContext, Node currentNode) { this.language = language; this.environment = environment; this.sourceBytes = sourceBytes; this.source = source; + + if (sourceEncoding != null) { + this.sourceEncoding = sourceEncoding; + } else { + this.sourceEncoding = Encodings.UTF_8; + } + this.parserContext = parserContext; this.currentNode = currentNode; - this.sourceEncoding = Encodings.UTF_8; // TODO } public TranslatorEnvironment getEnvironment() { @@ -549,6 +556,7 @@ private RubyNode translateBlockAndLambda(Nodes.Node node, Nodes.Node parametersN newEnvironment, sourceBytes, source, + sourceEncoding, parserContext, currentNode, arity); @@ -1487,6 +1495,7 @@ public RubyNode visitDefNode(Nodes.DefNode node) { newEnvironment, sourceBytes, source, + sourceEncoding, parserContext, currentNode); final CachedLazyCallTargetSupplier callTargetSupplier = defNodeTranslator.buildMethodNodeCompiler(node, arity); @@ -3273,6 +3282,7 @@ private RubyNode openModule(Nodes.Node moduleNode, RubyNode defineOrGetNode, Str newEnvironment, sourceBytes, source, + sourceEncoding, parserContext, currentNode); diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java index 7cd770c35916..4254f7ec3f8e 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java @@ -240,12 +240,14 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, // Translate to Ruby Truffle nodes + // use source encoding detected by manually, before source file is fully parsed byte[] sourceBytes = rubySource.getBytes(); final YARPTranslator translator = new YARPTranslator( language, environment, sourceBytes, source, + rubySource.getEncoding(), parserContext, currentNode); @@ -459,6 +461,9 @@ public static org.prism.Nodes.Node parseToYARPAST(RubyContext context, RubyLangu String value = rubySource.getTStringWithEncoding() .substring(magicComment.valueLocation.startOffset, magicComment.valueLocation.length) .toJavaString(); + // encoding magic comment is handled manually and available as RubySource#encoding + + // check the `primitive` TruffleRuby specific magic comment if (RubyLexer.isMagicTruffleRubyPrimitivesComment(name)) { configuration.allowTruffleRubyPrimitives = value.equalsIgnoreCase("true"); } From 3e09e87bfff7a07fc008d19692312649af91a556 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Wed, 3 Jan 2024 18:51:46 +0200 Subject: [PATCH 016/131] Fix return in ensure block when begin block is empty --- .../return/at_top_level_in_ensure_block.yaml | 70 +++++++++++++++++++ .../truffleruby/parser/YARPTranslator.java | 10 ++- 2 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 spec/truffle/parsing/fixtures/return/at_top_level_in_ensure_block.yaml diff --git a/spec/truffle/parsing/fixtures/return/at_top_level_in_ensure_block.yaml b/spec/truffle/parsing/fixtures/return/at_top_level_in_ensure_block.yaml new file mode 100644 index 000000000000..54fbc2b611b2 --- /dev/null +++ b/spec/truffle/parsing/fixtures/return/at_top_level_in_ensure_block.yaml @@ -0,0 +1,70 @@ +subject: "Return" +description: "return operator at the top level in ensure block" +notes: > + Is represented by LocalReturnNode node +yarp_specific: true # don't handle this case and don't simplify AST to a single `return ...` operator +focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" +ruby: | + begin + ensure + return 42 + end +ast: | + RubyTopLevelRootNode + attributes: + arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = true, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false} + callTarget = + checkArityProfile = false + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_} + instrumentationBits = 0 + keywordArguments = false + localReturnProfile = false + lock = java.util.concurrent.locks.ReentrantLock@...[Unlocked] + matchingReturnProfile = false + nextProfile = false + nonMatchingReturnProfile = false + polyglotRef = org.truffleruby.RubyLanguage@... + retryProfile = false + returnID = org.truffleruby.language.control.ReturnID@... + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = , blockDepth = 0, parseName = , notes = null, argumentDescriptors = null) + split = HEURISTIC + children: + body = + SequenceNode + attributes: + flags = 12 + children: + body = [ + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + EnsureNodeGen + attributes: + flags = 0 + children: + ensurePart = + LocalReturnNode + attributes: + flags = 1 + children: + value = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + tryPart = + NilLiteralNode + attributes: + flags = 0 + ] \ No newline at end of file diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 409a3972c293..1a5447471f6b 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -330,12 +330,16 @@ public RubyNode visitBackReferenceReadNode(Nodes.BackReferenceReadNode node) { public RubyNode visitBeginNode(Nodes.BeginNode node) { RubyNode rubyNode; - // empty begin/end block - if (node.statements == null) { + // empty begin/end block - so ignore possibly present rescue and else branches + if (node.statements == null && node.ensure_clause == null) { return new NilLiteralNode(); } - rubyNode = node.statements.accept(this); + if (node.statements != null) { + rubyNode = node.statements.accept(this); + } else { + rubyNode = new NilLiteralNode(); + } // fast path if (node.rescue_clause == null && node.ensure_clause == null) { From 6404d8335c33dc855a1567e3b6adf5123d58fe44 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Thu, 4 Jan 2024 15:20:55 +0100 Subject: [PATCH 017/131] Mark module_eval as using truffleruby_primitives * Before Prism it worked thanks to __FILE__ returning the real path instead of ` core/struct.rb` which is more correct. --- src/main/ruby/truffleruby/core/struct.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/ruby/truffleruby/core/struct.rb b/src/main/ruby/truffleruby/core/struct.rb index e10df626e9a7..0d220cf0045d 100644 --- a/src/main/ruby/truffleruby/core/struct.rb +++ b/src/main/ruby/truffleruby/core/struct.rb @@ -456,7 +456,8 @@ def self._specialize(attrs) "hash = Primitive.vm_hash_update hash, #{calc}" end.join("\n") - code, line = <<-CODE, __LINE__+1 + code, line = <<~CODE, __LINE__+1 + # truffleruby_primitives: true def initialize(#{args.join(", ")}) #{assigns.join(';')} self From 8fe67b34694972bf896b133fac869702ff176f2d Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Thu, 4 Jan 2024 15:35:32 +0100 Subject: [PATCH 018/131] Fix translation of PostExecutionNode --- spec/truffle/parsing/fixtures/END.yaml | 20 ++++++++++++------- .../truffleruby/parser/YARPTranslator.java | 6 ++++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/spec/truffle/parsing/fixtures/END.yaml b/spec/truffle/parsing/fixtures/END.yaml index e46889e84001..9e9f4f3deb5c 100644 --- a/spec/truffle/parsing/fixtures/END.yaml +++ b/spec/truffle/parsing/fixtures/END.yaml @@ -105,16 +105,22 @@ ast: | value = 2 ] receiver = - ReadConstantWithLexicalScopeNode + ReadConstantNode attributes: flags = 0 - lexicalScope = :: Object name = "KernelOperations" children: - getConstantNode = - GetConstantNodeGen - lookupConstantNode = - LookupConstantWithLexicalScopeNodeGen + moduleNode = + ReadConstantWithLexicalScopeNode attributes: + flags = 0 lexicalScope = :: Object - name = "KernelOperations" \ No newline at end of file + name = "Truffle" + children: + getConstantNode = + GetConstantNodeGen + lookupConstantNode = + LookupConstantWithLexicalScopeNodeGen + attributes: + lexicalScope = :: Object + name = "Truffle" \ No newline at end of file diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 1a5447471f6b..66ca7993e3aa 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -737,7 +737,7 @@ private ArgumentsAndBlockTranslation translateArgumentsAndBlock(Nodes.ArgumentsN final var splat = new Nodes.SplatNode(readRest, 0, 0); final var keywordHash = new Nodes.KeywordHashNode((short) 0, - new Nodes.Node[]{new Nodes.AssocSplatNode(readKeyRest, 0, 0)}, 0, 0); + new Nodes.Node[]{ new Nodes.AssocSplatNode(readKeyRest, 0, 0) }, 0, 0); // replace '...' argument with rest and keyrest arguments final var forwarding = new Nodes.Node[arguments.length + 1]; @@ -2662,7 +2662,9 @@ public RubyNode visitPostExecutionNode(Nodes.PostExecutionNode node) { // Turn into a call to Truffle::KernelOperations.at_exit // Create Prism CallNode to avoid duplication block literal related logic - final var receiver = new Nodes.ConstantReadNode("KernelOperations", 0, 0); + final var receiver = new Nodes.ConstantPathNode( + new Nodes.ConstantReadNode("Truffle", 0, 0), + new Nodes.ConstantReadNode("KernelOperations", 0, 0), 0, 0); final var arguments = new Nodes.ArgumentsNode(NO_FLAGS, new Nodes.Node[]{ new Nodes.FalseNode(0, 0) }, 0, 0); final var block = new Nodes.BlockNode(StringUtils.EMPTY_STRING_ARRAY, 0, null, node.statements, 0, 0); From 2db3f8dea51836c5dd30f766f95cfb0567e3a6ac Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Thu, 4 Jan 2024 16:18:29 +0100 Subject: [PATCH 019/131] Use ByteBasedCharSequence whenever possible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * This avoids: Invalid source section bounds. (java.lang.IllegalArgumentException) from com.oracle.truffle.api.source.Source.assertValid(Source.java:735) from com.oracle.truffle.api.source.Source.createSection(Source.java:669) * We need to remove the eager check using toJavaStringOrThrow() because e.g. spec/ruby/language/regexp/encoding_spec.rb fails it. .toJavaStringUncached() will anyway not fail but use � in that case. --- .../truffleruby/debug/TruffleDebugNodes.java | 17 +++++++++++------ .../language/loader/ByteBasedCharSequence.java | 6 ------ .../truffleruby/language/loader/EvalLoader.java | 6 +++--- .../truffleruby/language/loader/FileLoader.java | 2 +- .../truffleruby/language/loader/MainLoader.java | 6 ++++-- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java index e731a202679e..f21cbec2686d 100644 --- a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java +++ b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java @@ -58,6 +58,7 @@ import org.truffleruby.core.method.RubyUnboundMethod; import org.truffleruby.core.proc.RubyProc; import org.truffleruby.core.string.RubyString; +import org.truffleruby.core.string.TStringWithEncoding; import org.truffleruby.core.symbol.RubySymbol; import org.truffleruby.core.thread.ThreadManager; import org.truffleruby.debug.TruffleDebugNodes.ForeignArrayNode.ForeignArray; @@ -77,6 +78,7 @@ import org.truffleruby.language.backtrace.BacktraceFormatter; import org.truffleruby.language.control.RaiseException; import org.truffleruby.language.library.RubyStringLibrary; +import org.truffleruby.language.loader.ByteBasedCharSequence; import org.truffleruby.language.methods.DeclarationContext; import org.truffleruby.language.methods.InternalMethod; import org.truffleruby.annotations.Split; @@ -343,9 +345,10 @@ public abstract static class ParseASTNode extends CoreMethodArrayArgumentsNode { Object ast(Object code, @Cached RubyStringLibrary strings, @Cached TruffleString.FromJavaStringNode fromJavaStringNode) { - String codeString = RubyGuards.getJavaString(code); + var codeString = new TStringWithEncoding(RubyGuards.asTruffleStringUncached(code), + RubyStringLibrary.create().getEncoding(code)); String name = ""; - var source = Source.newBuilder("ruby", codeString, name).build(); + var source = Source.newBuilder("ruby", new ByteBasedCharSequence(codeString), name).build(); var rubySource = new RubySource(source, name); var staticScope = new StaticScope(StaticScope.Type.LOCAL, null); @@ -1429,17 +1432,19 @@ public abstract static class ParseAndDumpTruffleASTNode extends CoreMethodArrayA @TruffleBoundary Object parseAndDump(Object sourceCode, Object focusedNodeClassName, int index, @Cached TruffleString.FromJavaStringNode fromJavaStringNode) { - String sourceCodeString = RubyGuards.getJavaString(sourceCode); String nodeClassNameString = RubyGuards.getJavaString(focusedNodeClassName); - RubyRootNode rootNode = parse(sourceCodeString); + var code = new TStringWithEncoding(RubyGuards.asTruffleStringUncached(sourceCode), + RubyStringLibrary.create().getEncoding(sourceCode)); + + RubyRootNode rootNode = parse(code); String output = TruffleASTPrinter.dump(rootNode, nodeClassNameString, index); return createString(fromJavaStringNode, output, Encodings.UTF_8); } - private RubyRootNode parse(String sourceCode) { - Source source = Source.newBuilder("ruby", sourceCode, "").build(); + private RubyRootNode parse(TStringWithEncoding sourceCode) { + Source source = Source.newBuilder("ruby", new ByteBasedCharSequence(sourceCode), "").build(); TranslatorEnvironment.resetTemporaryVariablesIndex(); final RootCallTarget callTarget = getContext().getCodeLoader().parse( diff --git a/src/main/java/org/truffleruby/language/loader/ByteBasedCharSequence.java b/src/main/java/org/truffleruby/language/loader/ByteBasedCharSequence.java index 4b3dc2415a51..e0440b42cdb3 100644 --- a/src/main/java/org/truffleruby/language/loader/ByteBasedCharSequence.java +++ b/src/main/java/org/truffleruby/language/loader/ByteBasedCharSequence.java @@ -10,7 +10,6 @@ package org.truffleruby.language.loader; import com.oracle.truffle.api.strings.TruffleString; -import org.truffleruby.core.encoding.Encodings; import org.truffleruby.core.encoding.RubyEncoding; import org.truffleruby.core.string.TStringWithEncoding; @@ -25,11 +24,6 @@ public final class ByteBasedCharSequence implements CharSequence { public ByteBasedCharSequence(TStringWithEncoding tstringWithEnc) { this(tstringWithEnc.getBytesOrCopy(), 0, tstringWithEnc.byteLength(), tstringWithEnc.encoding); - - // Ensure it can be converted to a Java String early - if (tstringWithEnc.encoding == Encodings.BINARY) { - tstringWithEnc.toJavaStringOrThrow(); - } } private ByteBasedCharSequence(byte[] bytes, int offset, int length, RubyEncoding encoding) { diff --git a/src/main/java/org/truffleruby/language/loader/EvalLoader.java b/src/main/java/org/truffleruby/language/loader/EvalLoader.java index 0ba941d76768..eae0c6f74618 100644 --- a/src/main/java/org/truffleruby/language/loader/EvalLoader.java +++ b/src/main/java/org/truffleruby/language/loader/EvalLoader.java @@ -38,9 +38,8 @@ public static RubySource createEvalSource(RubyContext context, AbstractTruffleSt .argumentError(sourceEncoding + " is not ASCII compatible", currentNode)); } - final String sourceString; try { - sourceString = sourceTString.toJavaStringOrThrow(); + sourceTString.toJavaStringOrThrow(); } catch (CannotConvertBinaryRubyStringToJavaString e) { // In such a case, we have no way to build a Java String for the Truffle Source that // could accurately represent the source string, so we throw an error. @@ -55,7 +54,8 @@ public static RubySource createEvalSource(RubyContext context, AbstractTruffleSt currentNode.getEncapsulatingSourceSection())); } - final Source source = Source.newBuilder(TruffleRuby.LANGUAGE_ID, sourceString, file).build(); + final Source source = Source.newBuilder(TruffleRuby.LANGUAGE_ID, new ByteBasedCharSequence(sourceTString), file) + .build(); final RubySource rubySource = new RubySource(source, file, sourceTString, true, line - 1); diff --git a/src/main/java/org/truffleruby/language/loader/FileLoader.java b/src/main/java/org/truffleruby/language/loader/FileLoader.java index dd27ae80632c..fda233c7185d 100644 --- a/src/main/java/org/truffleruby/language/loader/FileLoader.java +++ b/src/main/java/org/truffleruby/language/loader/FileLoader.java @@ -139,7 +139,7 @@ Source buildSource(TruffleFile file, String path, TStringWithEncoding sourceTStr .newBuilder(TruffleRuby.LANGUAGE_ID, file) .canonicalizePath(false) .mimeType(mimeType) - .content(sourceTStringWithEncoding.tstring.toString()) + .content(new ByteBasedCharSequence(sourceTStringWithEncoding)) .internal(internal) .cached(!coverageEnabled) .build(); diff --git a/src/main/java/org/truffleruby/language/loader/MainLoader.java b/src/main/java/org/truffleruby/language/loader/MainLoader.java index 8d2fbeb13348..67551ff2244a 100644 --- a/src/main/java/org/truffleruby/language/loader/MainLoader.java +++ b/src/main/java/org/truffleruby/language/loader/MainLoader.java @@ -15,6 +15,7 @@ import org.truffleruby.RubyContext; import org.truffleruby.RubyLanguage; import org.truffleruby.core.encoding.Encodings; +import org.truffleruby.core.encoding.TStringUtils; import org.truffleruby.core.string.TStringWithEncoding; import org.truffleruby.parser.RubySource; import org.truffleruby.parser.lexer.RubyLexer; @@ -39,8 +40,9 @@ public MainLoader(RubyContext context, RubyLanguage language) { } public RubySource loadFromCommandLineArgument(String code) { + var sourceCode = new TStringWithEncoding(TStringUtils.fromJavaString(code, Encodings.UTF_8), Encodings.UTF_8); final Source source = Source - .newBuilder(TruffleRuby.LANGUAGE_ID, code, "-e") + .newBuilder(TruffleRuby.LANGUAGE_ID, new ByteBasedCharSequence(sourceCode), "-e") .mimeType(RubyLanguage.MIME_TYPE_MAIN_SCRIPT) .build(); return new RubySource(source, "-e"); @@ -51,7 +53,7 @@ public RubySource loadFromStandardIn(Node currentNode, String path) throws IOExc var sourceTString = transformScript(currentNode, path, sourceBytes); final Source source = Source - .newBuilder(TruffleRuby.LANGUAGE_ID, sourceTString.toString(), path) + .newBuilder(TruffleRuby.LANGUAGE_ID, new ByteBasedCharSequence(sourceTString), path) .mimeType(RubyLanguage.MIME_TYPE_MAIN_SCRIPT) .build(); return new RubySource(source, path, sourceTString); From 09705c3b3b2c0121594a30bc44121d8d48a0dd82 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 4 Jan 2024 20:45:16 +0200 Subject: [PATCH 020/131] Change END_spec.rb test to rely on exception class name instead of exception message --- spec/ruby/shared/kernel/at_exit.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ruby/shared/kernel/at_exit.rb b/spec/ruby/shared/kernel/at_exit.rb index 26ad361a5b83..4f54c4b28333 100644 --- a/spec/ruby/shared/kernel/at_exit.rb +++ b/spec/ruby/shared/kernel/at_exit.rb @@ -54,7 +54,7 @@ result = ruby_exe('{', options: "-r#{script}", args: "2>&1", exit_status: 1) $?.should_not.success? result.should.include?("handler ran\n") - result.should.include?("syntax error") + result.should.include?("SyntaxError") end it "calls the nested handler right after the outer one if a handler is nested into another handler" do From e5e525bbef01dd893f739395e490b46cf2ec60fd Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 9 Jan 2024 13:04:10 +0100 Subject: [PATCH 021/131] Fix SourceSection given to syntaxErrorAlreadyWithFileLine() --- .../java/org/truffleruby/parser/YARPTranslatorDriver.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java index 4254f7ec3f8e..0b0f6337adc7 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java @@ -445,14 +445,9 @@ public static org.prism.Nodes.Node parseToYARPAST(RubyContext context, RubyLangu SourceSection section = rubySource.getSource().createSection(location.startOffset, location.length); String message = context.fileLine(section) + ": " + error.message; - int lineNumber = RubySource.getStartLineAdjusted(context, section); - throw new RaiseException( context, - context.getCoreExceptions().syntaxErrorAlreadyWithFileLine( - message, - null, - rubySource.getSource().createSection(lineNumber))); + context.getCoreExceptions().syntaxErrorAlreadyWithFileLine(message, null, section)); } for (var magicComment : parseResult.magicComments) { From 760a3da599e7fcf563831a2b265d4865c0315c4b Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 9 Jan 2024 16:11:45 +0200 Subject: [PATCH 022/131] Fix Regexp encoding when encoding option is specified explicitly --- ...in_boolean_context_with_interpolation.yaml | 10 +++++++++- .../regexps/with_embedded_class_variable.yaml | 10 +++++++++- .../with_embedded_global_variable.yaml | 10 +++++++++- .../with_embedded_instance_variable.yaml | 10 +++++++++- .../fixtures/regexps/with_interpolation.yaml | 10 +++++++++- ...with_interpolation_without_expression.yaml | 10 +++++++++- .../truffleruby/parser/YARPTranslator.java | 20 +++++++++++++++++-- 7 files changed, 72 insertions(+), 8 deletions(-) diff --git a/spec/truffle/parsing/fixtures/regexps/in_boolean_context_with_interpolation.yaml b/spec/truffle/parsing/fixtures/regexps/in_boolean_context_with_interpolation.yaml index 6c057a68edf7..077ba3e5434f 100644 --- a/spec/truffle/parsing/fixtures/regexps/in_boolean_context_with_interpolation.yaml +++ b/spec/truffle/parsing/fixtures/regexps/in_boolean_context_with_interpolation.yaml @@ -6,7 +6,7 @@ notes: > Interpolation is handled with nodes: - InterpolatedRegexpNode - InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen -yarp_specific: true # there was an extra "" StringLiteralNode and RegexpOptions didn't have a 'literal' property +yarp_specific: true # RegexpOptions didn't have a 'literal' property focused_on_node: "org.truffleruby.language.dispatch.RubyCallNode" ruby: | /foo #{bar} baz/ ? 1 : 2 @@ -54,6 +54,14 @@ ast: | equalNode = TruffleStringFactory$EqualNodeGen children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = ASCII-8BIT + flags = 0 + tstring = "" ToSNodeGen children: valueNode_ = diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml index 078606a7f84c..28365e34ef3e 100644 --- a/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml +++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml @@ -1,6 +1,6 @@ subject: "Regexp" description: "with embedded class variable (#@@a)" -yarp_specific: true # there was an extra "" StringLiteralNode and RegexpOptions didn't have a 'literal' property +yarp_specific: true # RegexpOptions didn't have a 'literal' property focused_on_node: "org.truffleruby.core.regexp.InterpolatedRegexpNode" ruby: | /foo #@@bar/ @@ -20,6 +20,14 @@ ast: | equalNode = TruffleStringFactory$EqualNodeGen children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = ASCII-8BIT + flags = 0 + tstring = "" ToSNodeGen children: valueNode_ = diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml index 62d043654413..314c24fff2fa 100644 --- a/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml +++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml @@ -1,6 +1,6 @@ subject: "Regexp" description: "with embedded global variable (#$a)" -yarp_specific: true # there was an extra "" StringLiteralNode and RegexpOptions didn't have a 'literal' property +yarp_specific: true # RegexpOptions didn't have a 'literal' property focused_on_node: "org.truffleruby.core.regexp.InterpolatedRegexpNode" ruby: | /foo #$bar/ @@ -20,6 +20,14 @@ ast: | equalNode = TruffleStringFactory$EqualNodeGen children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = ASCII-8BIT + flags = 0 + tstring = "" ToSNodeGen children: valueNode_ = diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml index 99a2c527dcef..88fce6ae23df 100644 --- a/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml +++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml @@ -1,6 +1,6 @@ subject: "Regexp" description: "with embedded instance variable (#@a)" -yarp_specific: true # there was an extra "" StringLiteralNode and RegexpOptions didn't have a 'literal' property +yarp_specific: true # RegexpOptions didn't have a 'literal' property focused_on_node: "org.truffleruby.core.regexp.InterpolatedRegexpNode" ruby: | /foo #@bar/ @@ -20,6 +20,14 @@ ast: | equalNode = TruffleStringFactory$EqualNodeGen children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = ASCII-8BIT + flags = 0 + tstring = "" ToSNodeGen children: valueNode_ = diff --git a/spec/truffle/parsing/fixtures/regexps/with_interpolation.yaml b/spec/truffle/parsing/fixtures/regexps/with_interpolation.yaml index caf8403d71f9..a10d78899c4d 100644 --- a/spec/truffle/parsing/fixtures/regexps/with_interpolation.yaml +++ b/spec/truffle/parsing/fixtures/regexps/with_interpolation.yaml @@ -1,6 +1,6 @@ subject: "Regexp" description: "a literal with interpolation (with #{...})" -yarp_specific: true # there was an extra "" StringLiteralNode and RegexpOptions didn't have a 'literal' property +yarp_specific: true # RegexpOptions didn't have a 'literal' property focused_on_node: "org.truffleruby.core.regexp.InterpolatedRegexpNode" ruby: | /a#{ 42 }c/ @@ -20,6 +20,14 @@ ast: | equalNode = TruffleStringFactory$EqualNodeGen children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = ASCII-8BIT + flags = 0 + tstring = "" ToSNodeGen children: valueNode_ = diff --git a/spec/truffle/parsing/fixtures/regexps/with_interpolation_without_expression.yaml b/spec/truffle/parsing/fixtures/regexps/with_interpolation_without_expression.yaml index 7faf3e5c3586..571b28fe1e30 100644 --- a/spec/truffle/parsing/fixtures/regexps/with_interpolation_without_expression.yaml +++ b/spec/truffle/parsing/fixtures/regexps/with_interpolation_without_expression.yaml @@ -3,7 +3,7 @@ description: "a literal with interpolation but without expression (#{})" notes: > An empty expression is represented as a frozen empty string with (ObjectLiteralNode object = '') node. -yarp_specific: true # there is an extra "" StringLiteralNode with old translator +yarp_specific: true # RegexpOptions didn't have a 'literal' property focused_on_node: "org.truffleruby.core.regexp.InterpolatedRegexpNode" ruby: | /a#{}c/ @@ -23,6 +23,14 @@ ast: | equalNode = TruffleStringFactory$EqualNodeGen children = [ + ToSNodeGen + children: + valueNode_ = + StringLiteralNode + attributes: + encoding = ASCII-8BIT + flags = 0 + tstring = "" ToSNodeGen children: valueNode_ = diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 66ca7993e3aa..44e4c74628a4 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -2278,11 +2278,27 @@ public RubyNode visitInterpolatedMatchLastLineNode(Nodes.InterpolatedMatchLastLi @Override public RubyNode visitInterpolatedRegularExpressionNode(Nodes.InterpolatedRegularExpressionNode node) { + var encodingAndOptions = getRegexpEncodingAndOptions(new Nodes.RegularExpressionFlags(node.flags)); final ToSNode[] children = translateInterpolatedParts(node.parts); - var encodingAndOptions = getRegexpEncodingAndOptions(new Nodes.RegularExpressionFlags(node.flags)); + // TODO: optimise AST and pass initial encoding as a parameter instead of passing as a StringLiteralNode + // 0 element represents initial Regexp encoding derived from explicit Regexp modifiers + final ToSNode[] childrenWithPrefix = new ToSNode[children.length + 1]; + System.arraycopy(children, 0, childrenWithPrefix, 1, children.length); + final RubyEncoding prefixEncoding; + if (!encodingAndOptions.options.isKcodeDefault()) { // explicit encoding + prefixEncoding = encodingAndOptions.encoding; + } else { + // use BINARY explicitly probably because forcing encoding isn't implemented yet in Prism + // see https://github.com/ruby/prism/issues/1997 + prefixEncoding = Encodings.BINARY; + } + + var emptyTString = prefixEncoding.tencoding.getEmpty(); + var stringNode = new StringLiteralNode(emptyTString, prefixEncoding); + childrenWithPrefix[0] = ToSNodeGen.create(stringNode); - RubyNode rubyNode = new InterpolatedRegexpNode(children, encodingAndOptions.options); + RubyNode rubyNode = new InterpolatedRegexpNode(childrenWithPrefix, encodingAndOptions.options); if (node.isOnce()) { rubyNode = new OnceNode(rubyNode); From 199f7cd2e6a71e5e0ac8d8cc43662ff79437401f Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 9 Jan 2024 19:39:05 +0200 Subject: [PATCH 023/131] Add main_script attribute in YAML fixtures --- spec/truffle/parsing/parsing_spec.rb | 11 +++++++--- .../truffleruby/debug/TruffleDebugNodes.java | 22 ++++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/spec/truffle/parsing/parsing_spec.rb b/spec/truffle/parsing/parsing_spec.rb index d71d087a9909..8c08fe815ef7 100644 --- a/spec/truffle/parsing/parsing_spec.rb +++ b/spec/truffle/parsing/parsing_spec.rb @@ -19,6 +19,7 @@ # "some additional details to explain what this case actually tests (optional)" # yarp_specific: "true/false - we have different TruffleAST for YARP so don't run this test against JRuby parser" # focused_on_node: "a node class name" +# main_script: true # index: "integer, position of a node to focus on in AST when there are several such nodes and we need not the first one (optional)" # ruby: | # @@ -34,6 +35,9 @@ # # index is an optional attribute. Missing it means we need a node with index 0. # +# main_script - false by default. Means it's a loaded/required Ruby source file or the main one that is run by user. +# Some logic is related to main script, e.g. initialization of the DATA constant etc. +# # Don't run specs in multi-context mode and with JIT because they affect AST: # - in multi-context mode some nodes are replaced with dynamic-lexical-scope related ones # - with JIT some nodes are replaced with optimized ones (e.g. OptimizedCallTarget) @@ -65,10 +69,11 @@ filenames.each do |filename| yaml = YAML.safe_load_file(filename) - subject, description, yarp_specific, focused_on_node, index, source_code, expected_ast = yaml.values_at("subject", "description", "yarp_specific", "focused_on_node", "index", "ruby", "ast") + subject, description, yarp_specific, focused_on_node, index, main_script, source_code, expected_ast = yaml.values_at("subject", "description", "yarp_specific", "focused_on_node", "index", "main_script", "ruby", "ast") source_code.strip! expected_ast.strip! index = index.to_i + main_script = !!main_script # multiple-context mode, enabled JIT or changed default inline cache size affects Truffle AST. # So just don't run the pursing specs at all in such jobs on CI. @@ -79,9 +84,9 @@ # p "a #{subject} (#{description.strip}) case is parsed correctly" if original_parser - actual_ast = Truffle::Debug.parse_and_dump_truffle_ast(source_code, focused_on_node, index).strip + actual_ast = Truffle::Debug.parse_and_dump_truffle_ast(source_code, focused_on_node, index, main_script).strip else - actual_ast = Truffle::Debug.parse_with_yarp_and_dump_truffle_ast(source_code, focused_on_node, index).strip + actual_ast = Truffle::Debug.parse_with_yarp_and_dump_truffle_ast(source_code, focused_on_node, index, main_script).strip end if overwrite diff --git a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java index f21cbec2686d..8bdd88b31bc0 100644 --- a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java +++ b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java @@ -1425,31 +1425,32 @@ boolean isMultiThreaded() { } } - @CoreMethod(names = "parse_and_dump_truffle_ast", onSingleton = true, required = 3, lowerFixnum = 3) + @CoreMethod(names = "parse_and_dump_truffle_ast", onSingleton = true, required = 4, lowerFixnum = 3) public abstract static class ParseAndDumpTruffleASTNode extends CoreMethodArrayArgumentsNode { @Specialization @TruffleBoundary - Object parseAndDump(Object sourceCode, Object focusedNodeClassName, int index, + Object parseAndDump(Object sourceCode, Object focusedNodeClassName, int index, boolean mainScript, @Cached TruffleString.FromJavaStringNode fromJavaStringNode) { String nodeClassNameString = RubyGuards.getJavaString(focusedNodeClassName); var code = new TStringWithEncoding(RubyGuards.asTruffleStringUncached(sourceCode), RubyStringLibrary.create().getEncoding(sourceCode)); - RubyRootNode rootNode = parse(code); + RubyRootNode rootNode = parse(code, mainScript); String output = TruffleASTPrinter.dump(rootNode, nodeClassNameString, index); return createString(fromJavaStringNode, output, Encodings.UTF_8); } - private RubyRootNode parse(TStringWithEncoding sourceCode) { + private RubyRootNode parse(TStringWithEncoding sourceCode, boolean mainScript) { Source source = Source.newBuilder("ruby", new ByteBasedCharSequence(sourceCode), "").build(); TranslatorEnvironment.resetTemporaryVariablesIndex(); + var parserContext = mainScript ? ParserContext.TOP_LEVEL_FIRST : ParserContext.TOP_LEVEL; final RootCallTarget callTarget = getContext().getCodeLoader().parse( new RubySource(source, source.getName()), - ParserContext.TOP_LEVEL, + parserContext, null, getContext().getRootLexicalScope(), null); @@ -1458,18 +1459,18 @@ private RubyRootNode parse(TStringWithEncoding sourceCode) { } } - @CoreMethod(names = "parse_with_yarp_and_dump_truffle_ast", onSingleton = true, required = 3, lowerFixnum = 3) + @CoreMethod(names = "parse_with_yarp_and_dump_truffle_ast", onSingleton = true, required = 4, lowerFixnum = 3) public abstract static class ParseWithYARPAndDumpTruffleASTNode extends CoreMethodArrayArgumentsNode { @TruffleBoundary @Specialization(guards = "strings.isRubyString(code)", limit = "1") - Object parseAndDump(Object code, Object focusedNodeClassName, int index, + Object parseAndDump(Object code, Object focusedNodeClassName, int index, boolean mainScript, @Cached RubyStringLibrary strings, @Cached TruffleString.FromJavaStringNode fromJavaStringNode) { String nodeClassNameString = RubyGuards.getJavaString(focusedNodeClassName); RubyRootNode rootNode; try { - rootNode = parse(code); + rootNode = parse(code, mainScript); } catch (Error e) { if (e.getMessage() != null && e.getMessage().contains("does not know how to translate")) { throw new RaiseException(getContext(), coreExceptions().runtimeError(e.getMessage(), this)); @@ -1481,12 +1482,13 @@ Object parseAndDump(Object code, Object focusedNodeClassName, int index, return createString(fromJavaStringNode, output, Encodings.UTF_8); } - private RubyRootNode parse(Object code) { + private RubyRootNode parse(Object code, boolean mainScript) { TranslatorEnvironment.resetTemporaryVariablesIndex(); + var parserContext = mainScript ? ParserContext.TOP_LEVEL_FIRST : ParserContext.TOP_LEVEL; final RootCallTarget callTarget = getContext().getCodeLoader().parseWithYARP( code, - ParserContext.TOP_LEVEL, + parserContext, null, getContext().getRootLexicalScope(), null); From 723cf68460b62196e8394018a12b6885a50c5bf3 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 9 Jan 2024 19:43:28 +0200 Subject: [PATCH 024/131] Add YAML fixture for TOPLEVEL_BINDING constant --- .../parsing/fixtures/TOPLEVEL_BINDING.yaml | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 spec/truffle/parsing/fixtures/TOPLEVEL_BINDING.yaml diff --git a/spec/truffle/parsing/fixtures/TOPLEVEL_BINDING.yaml b/spec/truffle/parsing/fixtures/TOPLEVEL_BINDING.yaml new file mode 100644 index 000000000000..0b32f9c5c565 --- /dev/null +++ b/spec/truffle/parsing/fixtures/TOPLEVEL_BINDING.yaml @@ -0,0 +1,62 @@ +subject: "TOPLEVEL_BINDING" +description: TOPLEVEL_BINDING constant is defined in main Ruby script +notes: > + TOPLEVEL_BINDING is defined by SetTopLevelBindingNode node +focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" +main_script: true +ruby: | + a = 1 +ast: | + RubyTopLevelRootNode + attributes: + arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = true, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false} + callTarget =
+ checkArityProfile = false + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:a} + instrumentationBits = 0 + keywordArguments = false + localReturnProfile = false + lock = java.util.concurrent.locks.ReentrantLock@...[Unlocked] + matchingReturnProfile = false + nextProfile = false + nonMatchingReturnProfile = false + polyglotRef = org.truffleruby.RubyLanguage@... + retryProfile = false + returnID = org.truffleruby.language.control.ReturnID@... + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName =
, blockDepth = 0, parseName =
, notes = null, argumentDescriptors = null) + split = HEURISTIC + children: + body = + SequenceNode + attributes: + flags = 12 + children: + body = [ + SetTopLevelBindingNode + attributes: + flags = 0 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + WriteLocalVariableNode + attributes: + flags = 1 + frameSlot = 2 # a + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 1 + ] \ No newline at end of file From 3740ac4bc5b7605c194a08c883e93ea99c5d9204 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Wed, 10 Jan 2024 12:08:37 +0200 Subject: [PATCH 025/131] Translate __END__ keyword and define DATA constant --- spec/truffle/parsing/fixtures/__END__.yaml | 68 +++++++++++++++++++ .../org/truffleruby/language/DataNode.java | 2 +- .../parser/YARPTranslatorDriver.java | 33 ++++++--- 3 files changed, 91 insertions(+), 12 deletions(-) create mode 100644 spec/truffle/parsing/fixtures/__END__.yaml diff --git a/spec/truffle/parsing/fixtures/__END__.yaml b/spec/truffle/parsing/fixtures/__END__.yaml new file mode 100644 index 000000000000..d421ceffb51b --- /dev/null +++ b/spec/truffle/parsing/fixtures/__END__.yaml @@ -0,0 +1,68 @@ +subject: "__END__" +description: Presence of __END__ in main Ruby script means a DATA constant should be defined +notes: > + DATA is defined by DataNode node +focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" +main_script: true +ruby: | + a = 1 + __END__ + some data +ast: | + RubyTopLevelRootNode + attributes: + arityForCheck = Arity{preRequired = 0, optional = 0, hasRest = true, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false} + callTarget =
+ checkArityProfile = false + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:a} + instrumentationBits = 0 + keywordArguments = false + localReturnProfile = false + lock = java.util.concurrent.locks.ReentrantLock@...[Unlocked] + matchingReturnProfile = false + nextProfile = false + nonMatchingReturnProfile = false + polyglotRef = org.truffleruby.RubyLanguage@... + retryProfile = false + returnID = org.truffleruby.language.control.ReturnID@... + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName =
, blockDepth = 0, parseName =
, notes = null, argumentDescriptors = null) + split = HEURISTIC + children: + body = + SequenceNode + attributes: + flags = 12 + children: + body = [ + DataNode + attributes: + endPosition = 14 + flags = 0 + SetTopLevelBindingNode + attributes: + flags = 0 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + WriteLocalVariableNode + attributes: + flags = 1 + frameSlot = 2 # a + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 1 + ] \ No newline at end of file diff --git a/src/main/java/org/truffleruby/language/DataNode.java b/src/main/java/org/truffleruby/language/DataNode.java index c2679864b89c..ee34acad783b 100644 --- a/src/main/java/org/truffleruby/language/DataNode.java +++ b/src/main/java/org/truffleruby/language/DataNode.java @@ -23,7 +23,7 @@ public final class DataNode extends RubyContextSourceNode { @Child private TruffleString.FromJavaStringNode fromJavaStringNode; @Child private DispatchNode callHelperNode; - private final int endPosition; + private final int endPosition; // position in a source file at the beginning of a line right after __END__ keyword in bytes public DataNode(int endPosition) { this.endPosition = endPosition; diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java index 0b0f6337adc7..1d64f2571e23 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java @@ -58,6 +58,7 @@ import org.truffleruby.core.kernel.KernelGetsNode; import org.truffleruby.core.kernel.KernelPrintLastLineNode; import org.truffleruby.core.string.TStringWithEncoding; +import org.truffleruby.language.DataNode; import org.truffleruby.language.EmitWarningsNode; import org.truffleruby.language.LexicalScope; import org.truffleruby.language.RubyEvalRootNode; @@ -187,13 +188,14 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, // node = ParserCache.INSTANCE.get(source.getName()); // } else { printParseTranslateExecuteMetric("before-parsing", context, source); - node = context.getMetricsProfiler().callWithMetrics( + ParseResult parseResult = context.getMetricsProfiler().callWithMetrics( "parsing", source.getName(), () -> parseToYARPAST(context, language, rubySource, staticScope, parserConfiguration, rubyWarnings, parseEnvironment)); printParseTranslateExecuteMetric("after-parsing", context, source); // } + node = parseResult.value; // Needs the magic comment to be parsed parseEnvironment.allowTruffleRubyPrimitives = parserConfiguration.allowTruffleRubyPrimitives; @@ -342,12 +344,21 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, new SetTopLevelBindingNode(), truffleNode)); - // TODO: repair this logic - // if (node.hasEndPosition()) { - // truffleNode = Translator.sequence(sourceIndexLength, Arrays.asList( - // new DataNode(node.getEndPosition()), - // truffleNode)); - // } + if (parseResult.dataLocation != null) { + // startOffset - location of beginning of __END__, not ending + int offset = parseResult.dataLocation.startOffset + "__END__".length(); + + if (offset < source.getLength()) { + // There are characters after __END__. + // Handle optional "\n" after __END__ - it isn't part of DATA. + // Don't handle \r\n as far as Windows isn't supported. + offset += 1; + } + + truffleNode = Translator.sequence(sourceIndexLength, Arrays.asList( + new DataNode(offset), + truffleNode)); + } } final FrameDescriptor frameDescriptor = environment.computeFrameDescriptor(); @@ -395,7 +406,7 @@ private String getMethodName(ParserContext parserContext, MaterializedFrame pare } } - public static org.prism.Nodes.Node parseToYARPAST(RubyContext context, RubyLanguage language, RubySource rubySource, + public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLanguage language, RubySource rubySource, StaticScope blockScope, ParserConfiguration configuration, RubyDeferredWarnings rubyWarnings, ParseEnvironment parseEnvironment) { // LexerSource lexerSource = new LexerSource(rubySource); @@ -413,9 +424,9 @@ public static org.prism.Nodes.Node parseToYARPAST(RubyContext context, RubyLangu org.prism.Parser.loadLibrary(language.getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX); byte[] serializedBytes = Parser.parseAndSerialize(sourceBytes); - var yarpSource = createYARPSource(sourceBytes, rubySource); + Nodes.Source yarpSource = createYARPSource(sourceBytes, rubySource); parseEnvironment.yarpSource = yarpSource; - var parseResult = Loader.load(serializedBytes, yarpSource); + ParseResult parseResult = Loader.load(serializedBytes, yarpSource); final String filename = rubySource.getSourcePath(); final ParseResult.Error[] errors = parseResult.errors; @@ -464,7 +475,7 @@ public static org.prism.Nodes.Node parseToYARPAST(RubyContext context, RubyLangu } } - return parseResult.value; + return parseResult; // YARP end // RubyParser parser = new RubyParser(lexerSource, rubyWarnings); From cbec2a71b6e4d6428255a63bf135892534ad07a3 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Mon, 8 Jan 2024 16:56:17 +0200 Subject: [PATCH 026/131] Pass local variable names to eval --- src/main/c/yarp_bindings/src/yarp_bindings.c | 19 ++- .../parser/YARPTranslatorDriver.java | 64 ++++++++++- src/yarp/java/org/prism/Parser.java | 108 +++++++++++++++++- 3 files changed, 180 insertions(+), 11 deletions(-) diff --git a/src/main/c/yarp_bindings/src/yarp_bindings.c b/src/main/c/yarp_bindings/src/yarp_bindings.c index 56ec2cfa2668..06a527186d09 100644 --- a/src/main/c/yarp_bindings/src/yarp_bindings.c +++ b/src/main/c/yarp_bindings/src/yarp_bindings.c @@ -1,22 +1,33 @@ #include "prism.h" #include "org_prism_Parser.h" -JNIEXPORT jbyteArray JNICALL Java_org_prism_Parser_parseAndSerialize(JNIEnv *env, jclass clazz, jbyteArray source) { +JNIEXPORT jbyteArray JNICALL Java_org_prism_Parser_parseAndSerialize(JNIEnv *env, jclass clazz, jbyteArray source, jbyteArray options) { jsize size = (*env)->GetArrayLength(env, source); // Null-terminate for safety, as parsers are prone to read further than the end - jbyte* bytes = malloc(size + 4); + jbyte *bytes = malloc(size + 4); (*env)->GetByteArrayRegion(env, source, 0, size, bytes); memset(bytes + size, 0, 4); + // get options bytes + jbyte *options_bytes; + if (options) { + options_bytes = (*env)->GetByteArrayElements(env, options, NULL); + } else { + options_bytes = NULL; + } + pm_buffer_t buffer; pm_buffer_init(&buffer); - pm_serialize_parse(&buffer, (uint8_t*) bytes, size, NULL); + pm_serialize_parse(&buffer, (uint8_t *) bytes, size, (char *) options_bytes); free(bytes); + if (options) { + (*env)->ReleaseByteArrayElements(env, options, options_bytes, JNI_ABORT); + } jbyteArray serialized = (*env)->NewByteArray(env, buffer.length); - (*env)->SetByteArrayRegion(env, serialized, 0, buffer.length, (jbyte*) buffer.value); + (*env)->SetByteArrayRegion(env, serialized, 0, buffer.length, (jbyte *) buffer.value); pm_buffer_free(&buffer); diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java index 1d64f2571e23..a2a7b9d8a86b 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java @@ -57,6 +57,7 @@ import org.truffleruby.core.kernel.ChompLoopNode; import org.truffleruby.core.kernel.KernelGetsNode; import org.truffleruby.core.kernel.KernelPrintLastLineNode; +import org.truffleruby.core.string.StringOperations; import org.truffleruby.core.string.TStringWithEncoding; import org.truffleruby.language.DataNode; import org.truffleruby.language.EmitWarningsNode; @@ -90,6 +91,8 @@ import org.prism.ParseResult; import org.prism.Parser; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -132,19 +135,25 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, * we look them up ourselves after being told they're in some parent scope. */ final TranslatorEnvironment parentEnvironment; + final ArrayList> localVariableNames = new ArrayList<>(); int blockDepth = 0; if (parentFrame != null) { MaterializedFrame frame = parentFrame; while (frame != null) { + ArrayList names = new ArrayList<>(); + for (Object identifier : FrameDescriptorNamesIterator.iterate(frame.getFrameDescriptor())) { if (!BindingNodes.isHiddenVariable(identifier)) { final String name = (String) identifier; staticScope.addVariableThisScope(name.intern()); // StaticScope expects interned var names + + names.add(name); } } + localVariableNames.add(names); frame = RubyArguments.getDeclarationFrame(frame); blockDepth++; } @@ -191,8 +200,8 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, ParseResult parseResult = context.getMetricsProfiler().callWithMetrics( "parsing", source.getName(), - () -> parseToYARPAST(context, language, rubySource, staticScope, parserConfiguration, rubyWarnings, - parseEnvironment)); + () -> parseToYARPAST(context, language, rubySource, staticScope, localVariableNames, + parserConfiguration, rubyWarnings, parseEnvironment)); printParseTranslateExecuteMetric("after-parsing", context, source); // } node = parseResult.value; @@ -406,9 +415,9 @@ private String getMethodName(ParserContext parserContext, MaterializedFrame pare } } - public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLanguage language, RubySource rubySource, - StaticScope blockScope, ParserConfiguration configuration, RubyDeferredWarnings rubyWarnings, - ParseEnvironment parseEnvironment) { + public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLanguage language, + RubySource rubySource, StaticScope blockScope, ArrayList> localVariableNames, + ParserConfiguration configuration, RubyDeferredWarnings rubyWarnings, ParseEnvironment parseEnvironment) { // LexerSource lexerSource = new LexerSource(rubySource); // We only need to pass in current scope if we are evaluating as a block (which // is only done for evals). We need to pass this in so that we can appropriately scope @@ -422,7 +431,50 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang // YARP begin byte[] sourceBytes = rubySource.getBytes(); org.prism.Parser.loadLibrary(language.getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX); - byte[] serializedBytes = Parser.parseAndSerialize(sourceBytes); + + // Use CRuby syntax version 0 - it's the latest. We should select 3.3.0 instead. + // But https://github.com/ruby/prism/pull/2118#discussion_r1445987020, so latest for now. + Parser.ParsingOptions options; + if (rubySource.isEval()) { + int scopesCount = localVariableNames.size(); + Charset sourceCharset = rubySource.getEncoding().jcoding.getCharset(); + byte[][][] scopes = new byte[scopesCount][][]; + + for (int i = 0; i < scopesCount; i++) { + // Local variables are in order from inner scope to outer one, but Prism expects order from outer to inner. + // So we need to reverse the order + var namesList = localVariableNames.get(scopesCount - 1 - i); + byte[][] namesBytes = new byte[namesList.size()][]; + int j = 0; + for (var name : namesList) { + namesBytes[j] = name.getBytes(sourceCharset); + j++; + } + scopes[i] = namesBytes; + } + + options = new Parser.ParsingOptions( + rubySource.getSourcePath().getBytes(rubySource.getEncoding().jcoding.getCharset()), // encoding of the eval's String argument + rubySource.getLineOffset() + 1, + StringOperations.encodeAsciiBytes(rubySource.getEncoding().name.toString()), // encoding name is supposed to contain only ASCII characters + configuration.isFrozenStringLiteral(), + false, // isSuppressWarnings, + (byte) 0, + scopes); + } else { + assert localVariableNames.isEmpty(); // parsing of the whole source file cannot have outer scopes + + options = new Parser.ParsingOptions( + rubySource.getSourcePath().getBytes(StandardCharsets.UTF_8), // filesystem encoding, that is supposed to be always UTF-8 + rubySource.getLineOffset() + 1, + StringOperations.encodeAsciiBytes(rubySource.getEncoding().name.toString()), // encoding name is supposed to contain only ASCII characters + configuration.isFrozenStringLiteral(), + false, // isSuppressWarnings, + (byte) 0, + new byte[0][][]); + } + + byte[] serializedBytes = Parser.parseAndSerialize(sourceBytes, options); Nodes.Source yarpSource = createYARPSource(sourceBytes, rubySource); parseEnvironment.yarpSource = yarpSource; diff --git a/src/yarp/java/org/prism/Parser.java b/src/yarp/java/org/prism/Parser.java index 28b21b90e2ea..3d52e8f058d8 100644 --- a/src/yarp/java/org/prism/Parser.java +++ b/src/yarp/java/org/prism/Parser.java @@ -1,11 +1,117 @@ package org.prism; +import java.io.ByteArrayOutputStream; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; + public class Parser { + public static class ParsingOptions { + /** the name of the file that is currently being parsed */ + private final byte[] path; + /** the line within the file that the parser starts on. This value is 0-indexed */ + private final int startLineNumber; + /** the name of the encoding that the source file is in */ + private final byte[] encoding; + /** whether or not the frozen string literal option has been set */ + private final boolean isFrozenStringLiteral; + /** whether or not we should suppress warnings. */ + private final boolean isSuppressWarnings; + /** code of Ruby version which syntax will be used to parse */ + private final byte syntaxVersion; + /** scopes surrounding the code that is being parsed with local variable names defined in every scope */ + private final byte[][][] scopes; + + public ParsingOptions( + byte[] path, + int startLineNumber, + byte[] encoding, + boolean isFrozenStringLiteral, + boolean isSuppressWarnings, + byte syntaxVersion, + byte[][][] scopes) { + this.path = path; + this.startLineNumber = startLineNumber; + this.encoding = encoding; + this.isFrozenStringLiteral = isFrozenStringLiteral; + this.isSuppressWarnings = isSuppressWarnings; + this.syntaxVersion = syntaxVersion; + this.scopes = scopes; + } + + public byte[] serialize() { + final ByteArrayOutputStream output = new ByteArrayOutputStream(); + + // path + output.writeBytes(serializeInt(path.length)); + output.writeBytes(path); + + // line number + output.writeBytes(serializeInt(startLineNumber)); + + // encoding + output.writeBytes(serializeInt(encoding.length)); + output.writeBytes(encoding); + + // isFrozenStringLiteral + if (isFrozenStringLiteral) { + output.write(1); + } else { + output.write(0); + } + + // isSuppressWarnings + if (isSuppressWarnings) { + output.write(1); + } else { + output.write(0); + } + + // version + output.write(syntaxVersion); + + // scopes + + // number of scopes + output.writeBytes(serializeInt(scopes.length)); + // local variables in each scope + for (byte[][] scope : scopes) { + // number of locals + output.writeBytes(serializeInt(scope.length)); + + // locals + for (byte[] local : scope) { + output.writeBytes(serializeInt(local.length)); + output.writeBytes(local); + } + } + + return output.toByteArray(); + } + + private byte[] serializeInt(int n) { + ByteBuffer buffer = ByteBuffer.allocate(4).order(ByteOrder.nativeOrder()); + buffer.putInt(n); + return buffer.array(); + } + } + public static void loadLibrary(String path) { System.load(path); } - public static native byte[] parseAndSerialize(byte[] source); + public static native byte[] parseAndSerialize(byte[] source, byte[] options); + + public static byte[] parseAndSerialize(byte[] source) { + return parseAndSerialize(source, (byte[]) null); + } + + public static byte[] parseAndSerialize(byte[] source, ParsingOptions options) { + if (options != null) { + return parseAndSerialize(source, options.serialize()); + } else { + return parseAndSerialize(source); + } + } } From 21d3a234de9dead7f80319a24f5b1b08691780f5 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 11 Jan 2024 15:09:02 +0200 Subject: [PATCH 027/131] Use file path provided by Prism to translate __FILE__ keyword --- spec/truffle/parsing/fixtures/__FILE__.yaml | 11 +++++++++++ spec/truffle/parsing/parsing_spec.rb | 3 ++- .../java/org/truffleruby/parser/YARPTranslator.java | 5 ++--- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 spec/truffle/parsing/fixtures/__FILE__.yaml diff --git a/spec/truffle/parsing/fixtures/__FILE__.yaml b/spec/truffle/parsing/fixtures/__FILE__.yaml new file mode 100644 index 000000000000..59413b355f67 --- /dev/null +++ b/spec/truffle/parsing/fixtures/__FILE__.yaml @@ -0,0 +1,11 @@ +subject: "__FILE__ keyword" +description: "returns path to the current Ruby source file" +focused_on_node: "org.truffleruby.language.literal.StringLiteralNode" +ruby: | + __FILE__ +ast: | + StringLiteralNode + attributes: + encoding = UTF-8 + flags = 1 + tstring = \ No newline at end of file diff --git a/spec/truffle/parsing/parsing_spec.rb b/spec/truffle/parsing/parsing_spec.rb index 8c08fe815ef7..2a9beb340b3d 100644 --- a/spec/truffle/parsing/parsing_spec.rb +++ b/spec/truffle/parsing/parsing_spec.rb @@ -70,6 +70,7 @@ filenames.each do |filename| yaml = YAML.safe_load_file(filename) subject, description, yarp_specific, focused_on_node, index, main_script, source_code, expected_ast = yaml.values_at("subject", "description", "yarp_specific", "focused_on_node", "index", "main_script", "ruby", "ast") + description&.strip! source_code.strip! expected_ast.strip! index = index.to_i @@ -78,7 +79,7 @@ # multiple-context mode, enabled JIT or changed default inline cache size affects Truffle AST. # So just don't run the pursing specs at all in such jobs on CI. guard -> { Primitive.vm_single_context? && !TruffleRuby.jit? && Truffle::Boot.get_option("default-cache") != 0 } do - it "a #{subject} (#{description.strip}) case is parsed correctly" do + it "a #{subject} (#{description}) case is parsed correctly" do skip "YARP specific test" if original_parser && yarp_specific # p "a #{subject} (#{description.strip}) case is parsed correctly" diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 44e4c74628a4..a4c310f735b6 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -2964,9 +2964,8 @@ public RubyNode visitSourceFileNode(Nodes.SourceFileNode node) { // Note: ideally we would use the filesystem encoding here, but it is too early to get that. // The filesystem encoding on Linux and macOS is UTF-8 anyway, so keep it simple. RubyEncoding encoding = Encodings.UTF_8; - String path = language.getSourcePath(source); - var tstring = TruffleString.fromJavaStringUncached(path, encoding.tencoding); - var rubyNode = new StringLiteralNode(tstring, encoding); + var path = TruffleString.fromByteArrayUncached(node.filepath, encoding.tencoding); + var rubyNode = new StringLiteralNode(path, encoding); return assignPositionAndFlags(node, rubyNode); } From 5bb0d1bba9efbdc10002ac4192056c613be77243 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 11 Jan 2024 18:52:32 +0200 Subject: [PATCH 028/131] Raise SyntaxError in runtime for invalid yield --- .../org/truffleruby/parser/YARPTranslator.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index a4c310f735b6..5e2d786793dd 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -3135,6 +3135,18 @@ public RubyNode visitXStringNode(Nodes.XStringNode node) { @Override public RubyNode visitYieldNode(Nodes.YieldNode node) { + // YARP doesn't handle it on its own yet + // See https://github.com/ruby/prism/issues/1604 + if (isInvalidYield()) { + final RubyContext context = RubyLanguage.getCurrentContext(); + throw new RaiseException( + context, + context.getCoreExceptions().syntaxError( + "Invalid yield", + currentNode, + getSourceSection(node))); + } + var argumentsAndBlock = translateArgumentsAndBlock(node.arguments, null, ""); RubyNode readBlock = environment.findLocalVarOrNilNode(TranslatorEnvironment.METHOD_BLOCK_NAME, null); @@ -3450,7 +3462,7 @@ protected RubyNode translateNodeOrDeadNode(Nodes.Node node, String label) { } private boolean isInvalidYield() { - return environment.getSurroundingMethodEnvironment().isModuleBody(); + return environment.getSurroundingMethodEnvironment().isModuleBody(); // so not inside a method } // Arguments are represented by a single node: From 5b63fd76479ffeef3db90eb69d762a5b7355d5bf Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 11 Jan 2024 20:04:25 +0200 Subject: [PATCH 029/131] Tag failed specs related to known Prism issues --- spec/tags/language/hash_tags.txt | 5 +++++ spec/tags/language/heredoc_tags.txt | 1 + spec/tags/language/lambda_tags.txt | 2 ++ spec/tags/language/regexp/character_classes_tags.txt | 1 + spec/tags/language/regexp/grouping_tags.txt | 1 + spec/tags/language/regexp/modifiers_tags.txt | 2 ++ spec/tags/language/regexp_tags.txt | 2 ++ spec/tags/language/source_encoding_tags.txt | 2 ++ spec/tags/language/symbol_tags.txt | 1 + 9 files changed, 17 insertions(+) create mode 100644 spec/tags/language/regexp/character_classes_tags.txt create mode 100644 spec/tags/language/regexp/grouping_tags.txt create mode 100644 spec/tags/language/regexp/modifiers_tags.txt create mode 100644 spec/tags/language/regexp_tags.txt diff --git a/spec/tags/language/hash_tags.txt b/spec/tags/language/hash_tags.txt index 851d4229dcbf..645855c6c2ca 100644 --- a/spec/tags/language/hash_tags.txt +++ b/spec/tags/language/hash_tags.txt @@ -1,3 +1,8 @@ fails:The ** operator makes a caller-side copy when calling a method taking a positional Hash fails:Hash literal checks duplicated keys on initialization fails:Hash literal checks duplicated float keys on initialization +fails(https://github.com/ruby/prism/issues/2115):Hash literal expands an '**{}' or '**obj' element with the last key/value pair taking precedence +fails(https://github.com/ruby/prism/issues/2115):Hash literal expands an '**{}' and warns when finding an additional duplicate key afterwards +fails(https://github.com/ruby/prism/issues/2115):Hash literal merges multiple nested '**obj' in Hash literals +fails(https://github.com/ruby/prism/issues/2129):Hash literal raises an EncodingError at parse time when Symbol key with invalid bytes +fails(https://github.com/ruby/prism/issues/2129):Hash literal raises an EncodingError at parse time when Symbol key with invalid bytes and 'key: value' syntax used diff --git a/spec/tags/language/heredoc_tags.txt b/spec/tags/language/heredoc_tags.txt index 44a58ca6f5e9..4817cccf1a3c 100644 --- a/spec/tags/language/heredoc_tags.txt +++ b/spec/tags/language/heredoc_tags.txt @@ -1 +1,2 @@ fails:Heredoc string prints a warning if quoted HEREDOC identifier is ending not on same line +fails(https://github.com/ruby/prism/issues/2074):Heredoc string allows HEREDOC with <<~'identifier', no interpolation, with backslash diff --git a/spec/tags/language/lambda_tags.txt b/spec/tags/language/lambda_tags.txt index 0f3415dc800f..7953e342863c 100644 --- a/spec/tags/language/lambda_tags.txt +++ b/spec/tags/language/lambda_tags.txt @@ -1,2 +1,4 @@ fails:A lambda literal -> () { } assigns variables from parameters with circular optional argument reference raises a SyntaxError if using an existing local with the same name as the argument fails:A lambda literal -> () { } assigns variables from parameters with circular optional argument reference raises a SyntaxError if there is an existing method with the same name as the argument +fails(https://github.com/ruby/prism/issues/2067):"A lambda literal -> () { } assigns variables from parameters for definition \n @a = -> (a: @a = -> (a: 1) { a }, b:) do\n [a, b]\n end" +fails(https://github.com/ruby/prism/issues/2067):"A lambda expression 'lambda { ... }' assigns variables from parameters for definition \n @a = lambda do |a: (@a = -> (a: 1) { a }), b:|\n [a, b]\n end" diff --git a/spec/tags/language/regexp/character_classes_tags.txt b/spec/tags/language/regexp/character_classes_tags.txt new file mode 100644 index 000000000000..db733dbbde36 --- /dev/null +++ b/spec/tags/language/regexp/character_classes_tags.txt @@ -0,0 +1 @@ +fails(https://github.com/ruby/prism/issues/2116):Regexp with character classes supports [[:alpha:][:digit:][:etc:]] (predefined character classes) diff --git a/spec/tags/language/regexp/grouping_tags.txt b/spec/tags/language/regexp/grouping_tags.txt new file mode 100644 index 000000000000..374ad19133fd --- /dev/null +++ b/spec/tags/language/regexp/grouping_tags.txt @@ -0,0 +1 @@ +fails(https://github.com/ruby/prism/issues/2116):Regexps with grouping raises a SyntaxError when parentheses aren't balanced diff --git a/spec/tags/language/regexp/modifiers_tags.txt b/spec/tags/language/regexp/modifiers_tags.txt new file mode 100644 index 000000000000..6255d64c0102 --- /dev/null +++ b/spec/tags/language/regexp/modifiers_tags.txt @@ -0,0 +1,2 @@ +fails(https://github.com/ruby/prism/issues/2116):Regexps with modifiers supports (?imx-imx) (inline modifiers) +fails(https://github.com/ruby/prism/issues/2116):Regexps with modifiers supports (?imx-imx:expr) (scoped inline modifiers) diff --git a/spec/tags/language/regexp_tags.txt b/spec/tags/language/regexp_tags.txt new file mode 100644 index 000000000000..41abd442f49f --- /dev/null +++ b/spec/tags/language/regexp_tags.txt @@ -0,0 +1,2 @@ +fails(https://github.com/ruby/prism/issues/2115):Literal Regexps matches against $_ (last input) in a conditional if no explicit matchee provided +fails(https://github.com/ruby/prism/issues/2116):Literal Regexps throws SyntaxError for malformed literals diff --git a/spec/tags/language/source_encoding_tags.txt b/spec/tags/language/source_encoding_tags.txt index 2a84178e25f8..2b1956f2b200 100644 --- a/spec/tags/language/source_encoding_tags.txt +++ b/spec/tags/language/source_encoding_tags.txt @@ -5,3 +5,5 @@ slow:Source files encoded in UTF-16 LE with a BOM are invalid because they conta slow:Source files encoded in UTF-16 BE without a BOM are parsed as empty because they contain a NUL byte before the encoding comment slow:Source files encoded in UTF-16 BE with a BOM are invalid because they contain an invalid UTF-8 sequence before the encoding comment slow:Source files encoded in UTF-16 LE without a BOM are parsed as empty because they contain a NUL byte before the encoding comment +fails(https://github.com/ruby/prism/issues/2166):Source files encoded in UTF-16 LE with a BOM are invalid because they contain an invalid UTF-8 sequence before the encoding comment +fails(https://github.com/ruby/prism/issues/2166):Source files encoded in UTF-16 BE with a BOM are invalid because they contain an invalid UTF-8 sequence before the encoding comment diff --git a/spec/tags/language/symbol_tags.txt b/spec/tags/language/symbol_tags.txt index d40b01bbbbb4..01f23ebbce69 100644 --- a/spec/tags/language/symbol_tags.txt +++ b/spec/tags/language/symbol_tags.txt @@ -1,2 +1,3 @@ slow:A Symbol literal inherits the encoding of the magic comment and can have a binary encoding fails(cannot parse a Symbol with binary encoding and non-ASCII characters):A Symbol literal inherits the encoding of the magic comment and can have a binary encoding +fails(https://github.com/ruby/prism/issues/2129):A Symbol literal raises an EncodingError at parse time when Symbol with invalid bytes From 5fb8b16b8db645312069151f5bed252b349ba540 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Wed, 3 Jan 2024 14:01:50 +0200 Subject: [PATCH 030/131] Add failing specs for defined? --- spec/ruby/language/defined_spec.rb | 90 +++++++++++++++++-- spec/tags/language/defined_tags.txt | 6 ++ .../truffleruby/parser/YARPTranslator.java | 3 + 3 files changed, 94 insertions(+), 5 deletions(-) diff --git a/spec/ruby/language/defined_spec.rb b/spec/ruby/language/defined_spec.rb index b84fe9394ad2..e0cfb384bb7e 100644 --- a/spec/ruby/language/defined_spec.rb +++ b/spec/ruby/language/defined_spec.rb @@ -231,6 +231,14 @@ defined?(@@defined_specs_x = 2).should == "assignment" end + it "returns 'assignment' for assigning a constant" do + defined?(A = 2).should == "assignment" + end + + it "returns 'assignment' for assigning a fully qualified constant" do + defined?(Object::A = 2).should == "assignment" + end + it "returns 'assignment' for assigning multiple variables" do defined?((a, b = 1, 2)).should == "assignment" end @@ -248,7 +256,17 @@ end it "returns 'assignment' for an expression with '+='" do - defined?(x += 2).should == "assignment" + defined?(a += 1).should == "assignment" + defined?(@a += 1).should == "assignment" + defined?(@@a += 1).should == "assignment" + defined?($a += 1).should == "assignment" + defined?(A += 1).should == "assignment" + + # https://bugs.ruby-lang.org/issues/20111 + defined?(Object::A += 1).should == "expression" + + defined?(a.b += 1).should == "assignment" + defined?(a[:b] += 1).should == "assignment" end it "returns 'assignment' for an expression with '*='" do @@ -279,12 +297,74 @@ defined?(x >>= 2).should == "assignment" end - it "returns 'assignment' for an expression with '||='" do - defined?(x ||= 2).should == "assignment" + context "||=" do + it "returns 'assignment' for assigning a local variable with '||='" do + defined?(a ||= true).should == "assignment" + end + + it "returns 'assignment' for assigning an instance variable with '||='" do + defined?(@a ||= true).should == "assignment" + end + + it "returns 'assignment' for assigning a class variable with '||='" do + defined?(@@a ||= true).should == "assignment" + end + + it "returns 'assignment' for assigning a global variable with '||='" do + defined?($a ||= true).should == "assignment" + end + + it "returns 'assignment' for assigning a constant with '||='" do + defined?(A ||= true).should == "assignment" + end + + # https://bugs.ruby-lang.org/issues/20111 + it "returns 'expression' for assigning a fully qualified constant with '||='" do + defined?(Object::A ||= true).should == "expression" + end + + it "returns 'assignment' for assigning an attribute with '||='" do + defined?(a.b ||= true).should == "assignment" + end + + it "returns 'assignment' for assigning a referenced element with '||='" do + defined?(a[:b] ||= true).should == "assignment" + end end - it "returns 'assignment' for an expression with '&&='" do - defined?(x &&= 2).should == "assignment" + context "&&=" do + it "returns 'assignment' for assigning a local variable with '&&='" do + defined?(a &&= true).should == "assignment" + end + + it "returns 'assignment' for assigning an instance variable with '&&='" do + defined?(@a &&= true).should == "assignment" + end + + it "returns 'assignment' for assigning a class variable with '&&='" do + defined?(@@a &&= true).should == "assignment" + end + + it "returns 'assignment' for assigning a global variable with '&&='" do + defined?($a &&= true).should == "assignment" + end + + it "returns 'assignment' for assigning a constant with '&&='" do + defined?(A &&= true).should == "assignment" + end + + # https://bugs.ruby-lang.org/issues/20111 + it "returns 'expression' for assigning a fully qualified constant with '&&='" do + defined?(Object::A &&= true).should == "expression" + end + + it "returns 'assignment' for assigning an attribute with '&&='" do + defined?(a.b &&= true).should == "assignment" + end + + it "returns 'assignment' for assigning a referenced element with '&&='" do + defined?(a[:b] &&= true).should == "assignment" + end end it "returns 'assignment' for an expression with '**='" do diff --git a/spec/tags/language/defined_tags.txt b/spec/tags/language/defined_tags.txt index 356d2dc69c0e..94b24cc8213d 100644 --- a/spec/tags/language/defined_tags.txt +++ b/spec/tags/language/defined_tags.txt @@ -9,3 +9,9 @@ fails:The defined? keyword for a variable scoped constant returns nil if the glo fails:The defined? keyword for a variable scoped constant returns nil if the class scoped constant is not defined fails:The defined? keyword for a variable scoped constant returns nil if the local scoped constant is not defined fails:The defined? keyword when called with a method name in a void context warns about the void context when parsing it +fails:The defined? keyword for an expression returns 'assignment' for assigning a constant +fails:The defined? keyword for an expression returns 'assignment' for assigning a fully qualified constant +fails:The defined? keyword for an expression returns 'assignment' for an expression with '+=' +fails:The defined? keyword for an expression ||= returns 'assignment' for assigning a referenced element with '||=' +fails:The defined? keyword for an expression &&= returns 'expression' for assigning a fully qualified constant with '&&=' +fails:The defined? keyword for an expression &&= returns 'assignment' for assigning a referenced element with '&&=' diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 5e2d786793dd..6a5ddd35bc51 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -1149,6 +1149,7 @@ public RubyNode visitClassVariableOrWriteNode(Nodes.ClassVariableOrWriteNode nod var readNode = new Nodes.ClassVariableReadNode(node.name, startOffset, length).accept(this); var andNode = AndNodeGen.create(new DefinedNode(readNode), readNode); + // TODO: should be used for every ||= node (class variable/etc)? final RubyNode rubyNode = OrLazyValueDefinedNodeGen.create(andNode, writeNode); return assignPositionAndFlags(node, rubyNode); } @@ -1328,7 +1329,9 @@ public RubyNode visitConstantPathOperatorWriteNode(Nodes.ConstantPathOperatorWri final RubyNode rubyNode; if (writeParentNode != null) { + // defined?(A::B += 1) returns 'expression' so don't use DefinedWrapperNode here rubyNode = sequence(Arrays.asList(writeParentNode, writeNode.accept(this))); + // rubyNode may be already assigned source code in case writeParentNode is null assignPositionAndFlagsIfMissing(node, rubyNode); } else { From e1fc4dea5a41dd6d7e42a6ca11d3a33d2f19efd6 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Fri, 12 Jan 2024 13:38:21 +0200 Subject: [PATCH 031/131] Fix defined? and return "assignment" for some cases of assignment operators --- spec/ruby/language/defined_spec.rb | 42 ++- spec/tags/language/defined_tags.txt | 7 +- .../operators/&&=/reference_assignment.yaml | 152 +++++----- ...erence_assignment_with_block_argument.yaml | 272 +++++++++--------- ...ssignment_with_explicit_self_receiver.yaml | 98 ++++--- ...ence_assignment_with_multiple_indexes.yaml | 254 ++++++++-------- ...ignment_with_nested_splatted_argument.yaml | 254 ++++++++-------- ...nce_assignment_with_splatted_argument.yaml | 242 ++++++++-------- .../operators/+=/attribute_assignment.yaml | 123 ++++---- ...ssignment_with_explicit_self_receiver.yaml | 87 +++--- ...ignment_with_safe_navigation_operator.yaml | 145 +++++----- .../operators/+=/reference_assignment.yaml | 142 ++++----- ...erence_assignment_with_block_argument.yaml | 224 ++++++++------- ...ssignment_with_explicit_self_receiver.yaml | 92 +++--- ...ence_assignment_with_multiple_indexes.yaml | 212 +++++++------- ...ignment_with_nested_splatted_argument.yaml | 258 +++++++++-------- ...nce_assignment_with_splatted_argument.yaml | 248 ++++++++-------- .../operators/||=/reference_assignment.yaml | 152 +++++----- ...erence_assignment_with_block_argument.yaml | 272 +++++++++--------- ...ssignment_with_explicit_self_receiver.yaml | 98 ++++--- ...ence_assignment_with_multiple_indexes.yaml | 254 ++++++++-------- ...ignment_with_nested_splatted_argument.yaml | 254 ++++++++-------- ...nce_assignment_with_splatted_argument.yaml | 242 ++++++++-------- .../language/constants/WriteConstantNode.java | 8 + .../truffleruby/parser/BodyTranslator.java | 8 +- .../truffleruby/parser/YARPTranslator.java | 24 +- 26 files changed, 2221 insertions(+), 1943 deletions(-) diff --git a/spec/ruby/language/defined_spec.rb b/spec/ruby/language/defined_spec.rb index e0cfb384bb7e..e1680ca5bbd4 100644 --- a/spec/ruby/language/defined_spec.rb +++ b/spec/ruby/language/defined_spec.rb @@ -261,14 +261,24 @@ defined?(@@a += 1).should == "assignment" defined?($a += 1).should == "assignment" defined?(A += 1).should == "assignment" - - # https://bugs.ruby-lang.org/issues/20111 - defined?(Object::A += 1).should == "expression" - + # fully qualified constant check is moved out into a separate test case defined?(a.b += 1).should == "assignment" defined?(a[:b] += 1).should == "assignment" end + # https://bugs.ruby-lang.org/issues/20111 + ruby_version_is ""..."3.4" do + it "returns 'expression' for an assigning a fully qualified constant with '+='" do + defined?(Object::A += 1).should == "expression" + end + end + + ruby_version_is "3.4" do + it "returns 'assignment' for an assigning a fully qualified constant with '+='" do + defined?(Object::A += 1).should == "assignment" + end + end + it "returns 'assignment' for an expression with '*='" do defined?(x *= 2).should == "assignment" end @@ -319,8 +329,16 @@ end # https://bugs.ruby-lang.org/issues/20111 - it "returns 'expression' for assigning a fully qualified constant with '||='" do - defined?(Object::A ||= true).should == "expression" + ruby_version_is ""..."3.4" do + it "returns 'expression' for assigning a fully qualified constant with '||='" do + defined?(Object::A ||= true).should == "expression" + end + end + + ruby_version_is "3.4" do + it "returns 'assignment' for assigning a fully qualified constant with '||='" do + defined?(Object::A ||= true).should == "assignment" + end end it "returns 'assignment' for assigning an attribute with '||='" do @@ -354,8 +372,16 @@ end # https://bugs.ruby-lang.org/issues/20111 - it "returns 'expression' for assigning a fully qualified constant with '&&='" do - defined?(Object::A &&= true).should == "expression" + ruby_version_is ""..."3.4" do + it "returns 'expression' for assigning a fully qualified constant with '&&='" do + defined?(Object::A &&= true).should == "expression" + end + end + + ruby_version_is "3.4" do + it "returns 'assignment' for assigning a fully qualified constant with '&&='" do + defined?(Object::A &&= true).should == "assignment" + end end it "returns 'assignment' for assigning an attribute with '&&='" do diff --git a/spec/tags/language/defined_tags.txt b/spec/tags/language/defined_tags.txt index 94b24cc8213d..af98c0bf9e22 100644 --- a/spec/tags/language/defined_tags.txt +++ b/spec/tags/language/defined_tags.txt @@ -9,9 +9,6 @@ fails:The defined? keyword for a variable scoped constant returns nil if the glo fails:The defined? keyword for a variable scoped constant returns nil if the class scoped constant is not defined fails:The defined? keyword for a variable scoped constant returns nil if the local scoped constant is not defined fails:The defined? keyword when called with a method name in a void context warns about the void context when parsing it -fails:The defined? keyword for an expression returns 'assignment' for assigning a constant -fails:The defined? keyword for an expression returns 'assignment' for assigning a fully qualified constant -fails:The defined? keyword for an expression returns 'assignment' for an expression with '+=' -fails:The defined? keyword for an expression ||= returns 'assignment' for assigning a referenced element with '||=' +fails:The defined? keyword for an expression returns 'expression' for an assigning a fully qualified constant with '+=' fails:The defined? keyword for an expression &&= returns 'expression' for assigning a fully qualified constant with '&&=' -fails:The defined? keyword for an expression &&= returns 'assignment' for assigning a referenced element with '&&=' +fails:The defined? keyword for an expression ||= returns 'expression' for assigning a fully qualified constant with '||=' diff --git a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment.yaml b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment.yaml index d2fc9ab78a67..c0671b31d82a 100644 --- a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment.yaml +++ b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment.yaml @@ -32,86 +32,98 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 3 # %value_1 + definition = assignment + flags = 1 children: - valueNode = - IntegerFixnumLiteralNode + child = + SequenceNode attributes: flags = 0 - value = 42 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false children: - receiver = - SelfNode - attributes: - flags = 0 - AndNodeGen - attributes: - flags = 0 - children: - left = - InlinedIndexGetNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} - children: - leftNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL - rightNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - right = - InlinedIndexSetNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=true} - children: - operand1Node_ = - ReadLocalVariableNode + body = [ + WriteLocalVariableNode attributes: flags = 0 frameSlot = 3 # %value_1 - type = FRAME_LOCAL - operand2Node_ = - IntegerFixnumLiteralNode + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + WriteLocalVariableNode attributes: flags = 0 - value = 100500 - receiver_ = - ReadLocalVariableNode + frameSlot = 2 # %opelementassign_0 + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + AndNodeGen attributes: flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL + children: + left = + InlinedIndexGetNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + rightNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + right = + InlinedIndexSetNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=true} + children: + operand1Node_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + operand2Node_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + receiver_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + ] ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_block_argument.yaml b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_block_argument.yaml index b3834690e359..66754c98d7eb 100644 --- a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_block_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_block_argument.yaml @@ -27,157 +27,169 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 3 # %value_1 + definition = assignment + flags = 1 children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 42 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %value_2 - children: - valueNode = - ToProcNodeGen + child = + SequenceNode attributes: flags = 0 children: - childNode_ = - RubyCallNode + body = [ + WriteLocalVariableNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "block" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false + frameSlot = 3 # %value_1 children: - receiver = - SelfNode + valueNode = + IntegerFixnumLiteralNode attributes: flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - AndNodeGen - attributes: - flags = 0 - children: - left = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ] - block = - ToProcNodeGen + value = 42 + WriteLocalVariableNode attributes: flags = 0 + frameSlot = 4 # %value_2 children: - childNode_ = - ReadLocalVariableNode + valueNode = + ToProcNodeGen attributes: flags = 0 - frameSlot = 4 # %value_2 - type = FRAME_LOCAL - receiver = - ReadLocalVariableNode + children: + childNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "block" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + WriteLocalVariableNode attributes: flags = 0 frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL - right = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 100500 - ] - block = - ToProcNodeGen - attributes: - flags = 0 children: - childNode_ = - ReadLocalVariableNode + valueNode = + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false flags = 0 - frameSlot = 4 # %value_2 - type = FRAME_LOCAL - receiver = - ReadLocalVariableNode + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + AndNodeGen attributes: flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL + children: + left = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ] + block = + ToProcNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %value_2 + type = FRAME_LOCAL + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + right = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = true + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]=" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + ] + block = + ToProcNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %value_2 + type = FRAME_LOCAL + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + ] ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_explicit_self_receiver.yaml b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_explicit_self_receiver.yaml index c4699a46ca86..ce9d94af7e04 100644 --- a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_explicit_self_receiver.yaml +++ b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_explicit_self_receiver.yaml @@ -28,57 +28,69 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 2 # %value_0 + definition = assignment + flags = 1 children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 42 - AndNodeGen - attributes: - flags = 0 - children: - left = - InlinedIndexGetNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false} - children: - leftNode_ = - SelfNode - attributes: - flags = 0 - rightNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %value_0 - type = FRAME_LOCAL - right = - InlinedIndexSetNodeGen + child = + SequenceNode attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used)] flags = 0 - parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=true} children: - operand1Node_ = - ReadLocalVariableNode + body = [ + WriteLocalVariableNode attributes: flags = 0 frameSlot = 2 # %value_0 - type = FRAME_LOCAL - operand2Node_ = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 100500 - receiver_ = - SelfNode + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + AndNodeGen attributes: flags = 0 + children: + left = + InlinedIndexGetNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + SelfNode + attributes: + flags = 0 + rightNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %value_0 + type = FRAME_LOCAL + right = + InlinedIndexSetNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=true} + children: + operand1Node_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %value_0 + type = FRAME_LOCAL + operand2Node_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + receiver_ = + SelfNode + attributes: + flags = 0 + ] ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_multiple_indexes.yaml b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_multiple_indexes.yaml index 42180d45e499..3558fa34c93a 100644 --- a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_multiple_indexes.yaml +++ b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_multiple_indexes.yaml @@ -25,145 +25,157 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 42 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %value_2 - children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 43 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 5 # %value_3 - children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 44 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - AndNodeGen + DefinedWrapperNode attributes: - flags = 0 + definition = assignment + flags = 1 children: - left = - RubyCallNode + child = + SequenceNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false children: - arguments = [ - ReadLocalVariableNode + body = [ + WriteLocalVariableNode attributes: flags = 0 frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ReadLocalVariableNode + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + WriteLocalVariableNode attributes: flags = 0 frameSlot = 4 # %value_2 - type = FRAME_LOCAL - ReadLocalVariableNode + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 43 + WriteLocalVariableNode attributes: flags = 0 frameSlot = 5 # %value_3 - type = FRAME_LOCAL - ] - receiver = - ReadLocalVariableNode + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 44 + WriteLocalVariableNode attributes: flags = 0 frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL - right = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ReadLocalVariableNode + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + AndNodeGen attributes: flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %value_2 - type = FRAME_LOCAL - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 5 # %value_3 - type = FRAME_LOCAL - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 100500 + children: + left = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %value_2 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 5 # %value_3 + type = FRAME_LOCAL + ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + right = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = true + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]=" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %value_2 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 5 # %value_3 + type = FRAME_LOCAL + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_nested_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_nested_splatted_argument.yaml index e5baf23dab67..dee5970a3a27 100644 --- a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_nested_splatted_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_nested_splatted_argument.yaml @@ -27,157 +27,169 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 3 # %value_1 + definition = assignment + flags = 1 children: - valueNode = - SplatCastNodeGen + child = + SequenceNode attributes: - conversionMethod = :to_a - copy = true flags = 0 - nilBehavior = CONVERT children: - childNode_ = - RubyCallNode + body = [ + WriteLocalVariableNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "a" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false + frameSlot = 3 # %value_1 children: - receiver = - SelfNode + valueNode = + SplatCastNodeGen attributes: + conversionMethod = :to_a + copy = true flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - AndNodeGen - attributes: - flags = 0 - children: - left = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = true - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - SplatCastNodeGen + nilBehavior = CONVERT + children: + childNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "a" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + WriteLocalVariableNode attributes: - conversionMethod = :to_a - copy = false flags = 0 - nilBehavior = CONVERT + frameSlot = 2 # %opelementassign_0 children: - childNode_ = - ReadLocalVariableNode + valueNode = + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL - right = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = true - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ArrayConcatNode + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + AndNodeGen attributes: flags = 0 children: - children = [ - SplatCastNodeGen + left = + RubyCallNode attributes: - conversionMethod = :to_a - copy = true + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false flags = 0 - nilBehavior = CONVERT + isAttrAssign = false + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - childNode_ = + arguments = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = false + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ] + receiver = ReadLocalVariableNode attributes: flags = 0 - frameSlot = 3 # %value_1 + frameSlot = 2 # %opelementassign_0 type = FRAME_LOCAL - ArrayLiteralNode$UninitialisedArrayLiteralNode + right = + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false flags = 0 - language = org.truffleruby.RubyLanguage@... + isAttrAssign = true + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]=" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - values = [ - IntegerFixnumLiteralNode + arguments = [ + ArrayConcatNode attributes: flags = 0 - value = 100500 + children: + children = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = true + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ArrayLiteralNode$UninitialisedArrayLiteralNode + attributes: + flags = 0 + language = org.truffleruby.RubyLanguage@... + children: + values = [ + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + ] + ] ] - ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_splatted_argument.yaml index ec5040c32ef1..5314dd0a6a1c 100644 --- a/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_splatted_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/&&=/reference_assignment_with_splatted_argument.yaml @@ -34,149 +34,161 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "a" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 + definition = assignment + flags = 1 children: - valueNode = - RubyCallNode + child = + SequenceNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false children: - receiver = - SelfNode + body = [ + WriteLocalVariableNode attributes: flags = 0 - AndNodeGen - attributes: - flags = 0 - children: - left = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = true - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - SplatCastNodeGen - attributes: - conversionMethod = :to_a - copy = false - flags = 0 - nilBehavior = CONVERT + frameSlot = 3 # %value_1 children: - childNode_ = - ReadLocalVariableNode + valueNode = + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ] - receiver = - ReadLocalVariableNode + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "a" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + WriteLocalVariableNode attributes: flags = 0 frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL - right = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = true - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ArrayConcatNode + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + AndNodeGen attributes: flags = 0 children: - children = [ - SplatCastNodeGen + left = + RubyCallNode attributes: - conversionMethod = :to_a - copy = true + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false flags = 0 - nilBehavior = CONVERT + isAttrAssign = false + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - childNode_ = + arguments = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = false + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ] + receiver = ReadLocalVariableNode attributes: flags = 0 - frameSlot = 3 # %value_1 + frameSlot = 2 # %opelementassign_0 type = FRAME_LOCAL - ArrayLiteralNode$UninitialisedArrayLiteralNode + right = + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false flags = 0 - language = org.truffleruby.RubyLanguage@... + isAttrAssign = true + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]=" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - values = [ - IntegerFixnumLiteralNode + arguments = [ + ArrayConcatNode attributes: flags = 0 - value = 100500 + children: + children = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = true + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ArrayLiteralNode$UninitialisedArrayLiteralNode + attributes: + flags = 0 + language = org.truffleruby.RubyLanguage@... + children: + values = [ + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + ] + ] ] - ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment.yaml b/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment.yaml index deb04c801a8b..3a6317134bcb 100644 --- a/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment.yaml +++ b/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment.yaml @@ -7,7 +7,6 @@ notes: > temp_receiver = a temp_receiver.b = temp_receiver.b + c ``` -yarp_specific: true # fixed assigning method call node and set `isAttrAssign = true` focused_on_node: "org.truffleruby.language.control.SequenceNode" ruby: | a.foo += 42 @@ -31,85 +30,97 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 2 # %value_0 + definition = assignment + flags = 1 children: - valueNode = - RubyCallNode + child = + SequenceNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "a" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false children: - receiver = - SelfNode + body = [ + WriteLocalVariableNode attributes: flags = 0 - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "foo=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - InlinedAddNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} - children: - leftNode_ = + frameSlot = 2 # %value_0 + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "a" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 RubyCallNode attributes: descriptor = NoKeywordArgumentsDescriptor dispatchConfig = PROTECTED emptyKeywordsProfile = false flags = 0 - isAttrAssign = false + isAttrAssign = true isSafeNavigation = false isSplatted = false isVCall = false lastArgIsNotHashProfile = false - methodName = "foo" + methodName = "foo=" notEmptyKeywordsProfile = false notRuby2KeywordsHashProfile = false children: + arguments = [ + InlinedAddNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %value_0 + type = FRAME_LOCAL + rightNode_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + ] receiver = ReadLocalVariableNode attributes: flags = 0 frameSlot = 2 # %value_0 type = FRAME_LOCAL - rightNode_ = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 42 - ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %value_0 - type = FRAME_LOCAL + ] ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment_with_explicit_self_receiver.yaml b/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment_with_explicit_self_receiver.yaml index f8a411e9ec99..2e5e82920dd1 100644 --- a/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment_with_explicit_self_receiver.yaml +++ b/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment_with_explicit_self_receiver.yaml @@ -5,7 +5,6 @@ notes: > In AST it's represented with RubyCallNode's field dispatchConfig. `dispatchConfig = PRIVATE` means a method visibility is ignored. -yarp_specific: true # fixed assigning method call node and set `isAttrAssign = true` focused_on_node: "org.truffleruby.language.control.SequenceNode" ruby: | self.foo += 42 @@ -29,56 +28,62 @@ ast: | ReadSelfNode attributes: flags = 0 - RubyCallNode + DefinedWrapperNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "foo=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false + definition = assignment + flags = 1 children: - arguments = [ - InlinedAddNodeGen + child = + RubyCallNode attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false flags = 0 - parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + isAttrAssign = true + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "foo=" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - leftNode_ = - RubyCallNode + arguments = [ + InlinedAddNodeGen attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false + assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false + parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} children: - receiver = - SelfNode + leftNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + rightNode_ = + IntegerFixnumLiteralNode attributes: flags = 0 - rightNode_ = - IntegerFixnumLiteralNode + value = 42 + ] + receiver = + SelfNode attributes: flags = 0 - value = 42 - ] - receiver = - SelfNode - attributes: - flags = 0 ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment_with_safe_navigation_operator.yaml b/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment_with_safe_navigation_operator.yaml index 4bcc7d370f47..a03bcd51f9a3 100644 --- a/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment_with_safe_navigation_operator.yaml +++ b/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment_with_safe_navigation_operator.yaml @@ -17,7 +17,6 @@ notes: > (IsNilNode (ReadLocalVariableNode)) # %value_0 (RubyCallNode ...)) -yarp_specific: true # fixed assigning method call node and set `isAttrAssign = true` focused_on_node: "org.truffleruby.language.control.SequenceNode" ruby: | a&.foo += 42 @@ -41,101 +40,113 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %value_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "a" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - UnlessNodeGen + DefinedWrapperNode attributes: - flags = 0 + definition = assignment + flags = 1 children: - condition = - IsNilNode + child = + SequenceNode attributes: flags = 0 children: - child = - ReadLocalVariableNode + body = [ + WriteLocalVariableNode attributes: flags = 0 frameSlot = 2 # %value_0 - type = FRAME_LOCAL - thenBody = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "foo=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - InlinedAddNodeGen + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "a" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + UnlessNodeGen attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] flags = 0 - parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} children: - leftNode_ = + condition = + IsNilNode + attributes: + flags = 0 + children: + child = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %value_0 + type = FRAME_LOCAL + thenBody = RubyCallNode attributes: descriptor = NoKeywordArgumentsDescriptor dispatchConfig = PROTECTED emptyKeywordsProfile = false flags = 0 - isAttrAssign = false + isAttrAssign = true isSafeNavigation = false isSplatted = false isVCall = false lastArgIsNotHashProfile = false - methodName = "foo" + methodName = "foo=" notEmptyKeywordsProfile = false notRuby2KeywordsHashProfile = false children: + arguments = [ + InlinedAddNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %value_0 + type = FRAME_LOCAL + rightNode_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + ] receiver = ReadLocalVariableNode attributes: flags = 0 frameSlot = 2 # %value_0 type = FRAME_LOCAL - rightNode_ = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 42 ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %value_0 - type = FRAME_LOCAL ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment.yaml b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment.yaml index 10a92bc59c92..6895572ed314 100644 --- a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment.yaml +++ b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment.yaml @@ -32,88 +32,100 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 3 # %value_1 - children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 42 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 + definition = assignment + flags = 1 children: - valueNode = - RubyCallNode + child = + SequenceNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false children: - receiver = - SelfNode + body = [ + WriteLocalVariableNode attributes: flags = 0 - InlinedIndexSetNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=true} - children: - operand1Node_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - operand2Node_ = - InlinedAddNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} - children: - leftNode_ = - InlinedIndexGetNodeGen + frameSlot = 3 # %value_1 + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + InlinedIndexSetNodeGen attributes: assumptions = [Assumption(valid, name=set_trace_func is not used)] flags = 0 - parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=true} children: - leftNode_ = + operand1Node_ = ReadLocalVariableNode attributes: flags = 0 - frameSlot = 2 # %opelementassign_0 + frameSlot = 3 # %value_1 type = FRAME_LOCAL - rightNode_ = + operand2Node_ = + InlinedAddNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + InlinedIndexGetNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + rightNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + rightNode_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + receiver_ = ReadLocalVariableNode attributes: flags = 0 - frameSlot = 3 # %value_1 + frameSlot = 2 # %opelementassign_0 type = FRAME_LOCAL - rightNode_ = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 100500 - receiver_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL + ] ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_block_argument.yaml b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_block_argument.yaml index 96dfce5ed3f1..dad06d266ccd 100644 --- a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_block_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_block_argument.yaml @@ -27,111 +27,94 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 4 # %value_2 - children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 42 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 + definition = assignment + flags = 1 children: - valueNode = - ToProcNodeGen + child = + SequenceNode attributes: flags = 0 children: - childNode_ = - RubyCallNode + body = [ + WriteLocalVariableNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "block" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false + frameSlot = 4 # %value_2 children: - receiver = - SelfNode + valueNode = + IntegerFixnumLiteralNode attributes: flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode + value = 42 + WriteLocalVariableNode attributes: flags = 0 - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %value_2 - type = FRAME_LOCAL - InlinedAddNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} - children: - leftNode_ = + frameSlot = 3 # %value_1 + children: + valueNode = + ToProcNodeGen + attributes: + flags = 0 + children: + childNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "block" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 RubyCallNode attributes: descriptor = NoKeywordArgumentsDescriptor dispatchConfig = PROTECTED emptyKeywordsProfile = false flags = 0 - isAttrAssign = false + isAttrAssign = true isSafeNavigation = false isSplatted = false isVCall = false lastArgIsNotHashProfile = false - methodName = "[]" + methodName = "[]=" notEmptyKeywordsProfile = false notRuby2KeywordsHashProfile = false children: @@ -141,6 +124,57 @@ ast: | flags = 0 frameSlot = 4 # %value_2 type = FRAME_LOCAL + InlinedAddNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %value_2 + type = FRAME_LOCAL + ] + block = + ToProcNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + rightNode_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 ] block = ToProcNodeGen @@ -159,27 +193,5 @@ ast: | flags = 0 frameSlot = 2 # %opelementassign_0 type = FRAME_LOCAL - rightNode_ = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 100500 - ] - block = - ToProcNodeGen - attributes: - flags = 0 - children: - childNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL + ] ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_explicit_self_receiver.yaml b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_explicit_self_receiver.yaml index 999c6c6ab90a..2d0ebbca32f8 100644 --- a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_explicit_self_receiver.yaml +++ b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_explicit_self_receiver.yaml @@ -28,59 +28,71 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 2 # %value_0 + definition = assignment + flags = 1 children: - valueNode = - IntegerFixnumLiteralNode + child = + SequenceNode attributes: flags = 0 - value = 42 - InlinedIndexSetNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=true} - children: - operand1Node_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %value_0 - type = FRAME_LOCAL - operand2Node_ = - InlinedAddNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} children: - leftNode_ = - InlinedIndexGetNodeGen + body = [ + WriteLocalVariableNode attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used)] flags = 0 - parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + frameSlot = 2 # %value_0 children: - leftNode_ = - SelfNode + valueNode = + IntegerFixnumLiteralNode attributes: flags = 0 - rightNode_ = + value = 42 + InlinedIndexSetNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=true} + children: + operand1Node_ = ReadLocalVariableNode attributes: flags = 0 frameSlot = 2 # %value_0 type = FRAME_LOCAL - rightNode_ = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 100500 - receiver_ = - SelfNode - attributes: - flags = 0 + operand2Node_ = + InlinedAddNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + InlinedIndexGetNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + SelfNode + attributes: + flags = 0 + rightNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %value_0 + type = FRAME_LOCAL + rightNode_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + receiver_ = + SelfNode + attributes: + flags = 0 + ] ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_multiple_indexes.yaml b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_multiple_indexes.yaml index da16cf45ede8..8aafea0bc9f6 100644 --- a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_multiple_indexes.yaml +++ b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_multiple_indexes.yaml @@ -25,111 +25,84 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 42 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %value_2 - children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 43 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 5 # %value_3 + definition = assignment + flags = 1 children: - valueNode = - IntegerFixnumLiteralNode + child = + SequenceNode attributes: flags = 0 - value = 44 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false children: - receiver = - SelfNode + body = [ + WriteLocalVariableNode attributes: flags = 0 - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %value_2 - type = FRAME_LOCAL - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 5 # %value_3 - type = FRAME_LOCAL - InlinedAddNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} - children: - leftNode_ = + frameSlot = 3 # %value_1 + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %value_2 + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 43 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 5 # %value_3 + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 44 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 RubyCallNode attributes: descriptor = NoKeywordArgumentsDescriptor dispatchConfig = PROTECTED emptyKeywordsProfile = false flags = 0 - isAttrAssign = false + isAttrAssign = true isSafeNavigation = false isSplatted = false isVCall = false lastArgIsNotHashProfile = false - methodName = "[]" + methodName = "[]=" notEmptyKeywordsProfile = false notRuby2KeywordsHashProfile = false children: @@ -149,6 +122,56 @@ ast: | flags = 0 frameSlot = 5 # %value_3 type = FRAME_LOCAL + InlinedAddNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %value_2 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 5 # %value_3 + type = FRAME_LOCAL + ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + rightNode_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 ] receiver = ReadLocalVariableNode @@ -156,16 +179,5 @@ ast: | flags = 0 frameSlot = 2 # %opelementassign_0 type = FRAME_LOCAL - rightNode_ = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 100500 - ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL + ] ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_nested_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_nested_splatted_argument.yaml index 9855df8adda0..819d10db9d32 100644 --- a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_nested_splatted_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_nested_splatted_argument.yaml @@ -27,159 +27,171 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 3 # %value_1 + definition = assignment + flags = 1 children: - valueNode = - SplatCastNodeGen + child = + SequenceNode attributes: - conversionMethod = :to_a - copy = true flags = 0 - nilBehavior = CONVERT children: - childNode_ = - RubyCallNode + body = [ + WriteLocalVariableNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "a" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false + frameSlot = 3 # %value_1 children: - receiver = - SelfNode + valueNode = + SplatCastNodeGen attributes: + conversionMethod = :to_a + copy = true flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = true - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ArrayConcatNode - attributes: - flags = 0 - children: - children = [ - SplatCastNodeGen - attributes: - conversionMethod = :to_a - copy = true - flags = 0 - nilBehavior = CONVERT - children: - childNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ArrayLiteralNode$UninitialisedArrayLiteralNode - attributes: - flags = 0 - language = org.truffleruby.RubyLanguage@... - children: - values = [ - InlinedAddNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + nilBehavior = CONVERT children: - leftNode_ = + childNode_ = RubyCallNode attributes: descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED + dispatchConfig = PRIVATE emptyKeywordsProfile = false flags = 0 isAttrAssign = false isSafeNavigation = false - isSplatted = true - isVCall = false + isSplatted = false + isVCall = true lastArgIsNotHashProfile = false - methodName = "[]" + methodName = "a" notEmptyKeywordsProfile = false notRuby2KeywordsHashProfile = false children: - arguments = [ - SplatCastNodeGen + receiver = + SelfNode attributes: - conversionMethod = :to_a - copy = false flags = 0 - nilBehavior = CONVERT - children: - childNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ] - receiver = + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = true + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]=" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ArrayConcatNode + attributes: + flags = 0 + children: + children = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = true + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = ReadLocalVariableNode attributes: flags = 0 - frameSlot = 2 # %opelementassign_0 + frameSlot = 3 # %value_1 type = FRAME_LOCAL - rightNode_ = - IntegerFixnumLiteralNode + ArrayLiteralNode$UninitialisedArrayLiteralNode attributes: flags = 0 - value = 100500 + language = org.truffleruby.RubyLanguage@... + children: + values = [ + InlinedAddNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = false + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + rightNode_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + ] + ] ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL ] - ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_splatted_argument.yaml index 193b1f6c515c..aa88e93bb267 100644 --- a/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_splatted_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/+=/reference_assignment_with_splatted_argument.yaml @@ -34,151 +34,163 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 3 # %value_1 + definition = assignment + flags = 1 children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "a" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode + child = + SequenceNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false children: - receiver = - SelfNode + body = [ + WriteLocalVariableNode attributes: flags = 0 - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = true - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ArrayConcatNode - attributes: - flags = 0 - children: - children = [ - SplatCastNodeGen + frameSlot = 3 # %value_1 + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "a" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + WriteLocalVariableNode attributes: - conversionMethod = :to_a - copy = true flags = 0 - nilBehavior = CONVERT + frameSlot = 2 # %opelementassign_0 children: - childNode_ = - ReadLocalVariableNode + valueNode = + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ArrayLiteralNode$UninitialisedArrayLiteralNode + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false flags = 0 - language = org.truffleruby.RubyLanguage@... + isAttrAssign = true + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]=" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - values = [ - InlinedAddNodeGen + arguments = [ + ArrayConcatNode attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] flags = 0 - parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} children: - leftNode_ = - RubyCallNode + children = [ + SplatCastNodeGen attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false + conversionMethod = :to_a + copy = true flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = true - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false + nilBehavior = CONVERT children: - arguments = [ - SplatCastNodeGen - attributes: - conversionMethod = :to_a - copy = false - flags = 0 - nilBehavior = CONVERT - children: - childNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ] - receiver = + childNode_ = ReadLocalVariableNode attributes: flags = 0 - frameSlot = 2 # %opelementassign_0 + frameSlot = 3 # %value_1 type = FRAME_LOCAL - rightNode_ = - IntegerFixnumLiteralNode + ArrayLiteralNode$UninitialisedArrayLiteralNode attributes: flags = 0 - value = 100500 + language = org.truffleruby.RubyLanguage@... + children: + values = [ + InlinedAddNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = false + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + rightNode_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + ] + ] ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL ] - ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment.yaml index ac3e50cc5139..d1827d1fd80a 100644 --- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment.yaml +++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment.yaml @@ -32,86 +32,98 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 3 # %value_1 + definition = assignment + flags = 1 children: - valueNode = - IntegerFixnumLiteralNode + child = + SequenceNode attributes: flags = 0 - value = 42 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false children: - receiver = - SelfNode - attributes: - flags = 0 - OrNodeGen - attributes: - flags = 0 - children: - left = - InlinedIndexGetNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} - children: - leftNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL - rightNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - right = - InlinedIndexSetNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=true} - children: - operand1Node_ = - ReadLocalVariableNode + body = [ + WriteLocalVariableNode attributes: flags = 0 frameSlot = 3 # %value_1 - type = FRAME_LOCAL - operand2Node_ = - IntegerFixnumLiteralNode + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + WriteLocalVariableNode attributes: flags = 0 - value = 100500 - receiver_ = - ReadLocalVariableNode + frameSlot = 2 # %opelementassign_0 + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + OrNodeGen attributes: flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL + children: + left = + InlinedIndexGetNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + rightNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + right = + InlinedIndexSetNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=true} + children: + operand1Node_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + operand2Node_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + receiver_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + ] ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_block_argument.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_block_argument.yaml index db781b229dee..e346fbce3f5f 100644 --- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_block_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_block_argument.yaml @@ -27,157 +27,169 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 3 # %value_1 + definition = assignment + flags = 1 children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 42 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %value_2 - children: - valueNode = - ToProcNodeGen + child = + SequenceNode attributes: flags = 0 children: - childNode_ = - RubyCallNode + body = [ + WriteLocalVariableNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "block" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false + frameSlot = 3 # %value_1 children: - receiver = - SelfNode + valueNode = + IntegerFixnumLiteralNode attributes: flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - OrNodeGen - attributes: - flags = 0 - children: - left = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ] - block = - ToProcNodeGen + value = 42 + WriteLocalVariableNode attributes: flags = 0 + frameSlot = 4 # %value_2 children: - childNode_ = - ReadLocalVariableNode + valueNode = + ToProcNodeGen attributes: flags = 0 - frameSlot = 4 # %value_2 - type = FRAME_LOCAL - receiver = - ReadLocalVariableNode + children: + childNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "block" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + WriteLocalVariableNode attributes: flags = 0 frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL - right = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 100500 - ] - block = - ToProcNodeGen - attributes: - flags = 0 children: - childNode_ = - ReadLocalVariableNode + valueNode = + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false flags = 0 - frameSlot = 4 # %value_2 - type = FRAME_LOCAL - receiver = - ReadLocalVariableNode + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + OrNodeGen attributes: flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL + children: + left = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ] + block = + ToProcNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %value_2 + type = FRAME_LOCAL + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + right = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = true + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]=" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + ] + block = + ToProcNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %value_2 + type = FRAME_LOCAL + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + ] ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_explicit_self_receiver.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_explicit_self_receiver.yaml index 4c4c98fd5ec3..ee8ccedd4c0a 100644 --- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_explicit_self_receiver.yaml +++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_explicit_self_receiver.yaml @@ -28,57 +28,69 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 2 # %value_0 + definition = assignment + flags = 1 children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 42 - OrNodeGen - attributes: - flags = 0 - children: - left = - InlinedIndexGetNodeGen - attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used)] - flags = 0 - parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false} - children: - leftNode_ = - SelfNode - attributes: - flags = 0 - rightNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %value_0 - type = FRAME_LOCAL - right = - InlinedIndexSetNodeGen + child = + SequenceNode attributes: - assumptions = [Assumption(valid, name=set_trace_func is not used)] flags = 0 - parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=true} children: - operand1Node_ = - ReadLocalVariableNode + body = [ + WriteLocalVariableNode attributes: flags = 0 frameSlot = 2 # %value_0 - type = FRAME_LOCAL - operand2Node_ = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 100500 - receiver_ = - SelfNode + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + OrNodeGen attributes: flags = 0 + children: + left = + InlinedIndexGetNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='[]', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false} + children: + leftNode_ = + SelfNode + attributes: + flags = 0 + rightNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %value_0 + type = FRAME_LOCAL + right = + InlinedIndexSetNodeGen + attributes: + assumptions = [Assumption(valid, name=set_trace_func is not used)] + flags = 0 + parameters = RubyCallNodeParameters{methodName='[]=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=true} + children: + operand1Node_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %value_0 + type = FRAME_LOCAL + operand2Node_ = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + receiver_ = + SelfNode + attributes: + flags = 0 + ] ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_multiple_indexes.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_multiple_indexes.yaml index a77d49188c74..cd277615aed4 100644 --- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_multiple_indexes.yaml +++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_multiple_indexes.yaml @@ -25,145 +25,157 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 42 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %value_2 - children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 43 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 5 # %value_3 - children: - valueNode = - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 44 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - OrNodeGen + DefinedWrapperNode attributes: - flags = 0 + definition = assignment + flags = 1 children: - left = - RubyCallNode + child = + SequenceNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false children: - arguments = [ - ReadLocalVariableNode + body = [ + WriteLocalVariableNode attributes: flags = 0 frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ReadLocalVariableNode + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 42 + WriteLocalVariableNode attributes: flags = 0 frameSlot = 4 # %value_2 - type = FRAME_LOCAL - ReadLocalVariableNode + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 43 + WriteLocalVariableNode attributes: flags = 0 frameSlot = 5 # %value_3 - type = FRAME_LOCAL - ] - receiver = - ReadLocalVariableNode + children: + valueNode = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 44 + WriteLocalVariableNode attributes: flags = 0 frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL - right = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = false - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ReadLocalVariableNode + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + OrNodeGen attributes: flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %value_2 - type = FRAME_LOCAL - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 5 # %value_3 - type = FRAME_LOCAL - IntegerFixnumLiteralNode - attributes: - flags = 0 - value = 100500 + children: + left = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %value_2 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 5 # %value_3 + type = FRAME_LOCAL + ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL + right = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = true + isSafeNavigation = false + isSplatted = false + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]=" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = [ + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %value_2 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 5 # %value_3 + type = FRAME_LOCAL + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml index 0263b443655f..a14dc2c3f0bc 100644 --- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml @@ -27,157 +27,169 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 3 # %value_1 + definition = assignment + flags = 1 children: - valueNode = - SplatCastNodeGen + child = + SequenceNode attributes: - conversionMethod = :to_a - copy = true flags = 0 - nilBehavior = CONVERT children: - childNode_ = - RubyCallNode + body = [ + WriteLocalVariableNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "a" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false + frameSlot = 3 # %value_1 children: - receiver = - SelfNode + valueNode = + SplatCastNodeGen attributes: + conversionMethod = :to_a + copy = true flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - OrNodeGen - attributes: - flags = 0 - children: - left = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = true - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - SplatCastNodeGen + nilBehavior = CONVERT + children: + childNode_ = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "a" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + WriteLocalVariableNode attributes: - conversionMethod = :to_a - copy = false flags = 0 - nilBehavior = CONVERT + frameSlot = 2 # %opelementassign_0 children: - childNode_ = - ReadLocalVariableNode + valueNode = + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL - right = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = true - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ArrayConcatNode + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + OrNodeGen attributes: flags = 0 children: - children = [ - SplatCastNodeGen + left = + RubyCallNode attributes: - conversionMethod = :to_a - copy = true + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false flags = 0 - nilBehavior = CONVERT + isAttrAssign = false + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - childNode_ = + arguments = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = false + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ] + receiver = ReadLocalVariableNode attributes: flags = 0 - frameSlot = 3 # %value_1 + frameSlot = 2 # %opelementassign_0 type = FRAME_LOCAL - ArrayLiteralNode$UninitialisedArrayLiteralNode + right = + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false flags = 0 - language = org.truffleruby.RubyLanguage@... + isAttrAssign = true + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]=" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - values = [ - IntegerFixnumLiteralNode + arguments = [ + ArrayConcatNode attributes: flags = 0 - value = 100500 + children: + children = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = true + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ArrayLiteralNode$UninitialisedArrayLiteralNode + attributes: + flags = 0 + language = org.truffleruby.RubyLanguage@... + children: + values = [ + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + ] + ] ] - ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL ] \ No newline at end of file diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_splatted_argument.yaml index 880e92af2173..86ac089ff371 100644 --- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_splatted_argument.yaml +++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_splatted_argument.yaml @@ -34,149 +34,161 @@ ast: | ReadSelfNode attributes: flags = 0 - WriteLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %value_1 - children: - valueNode = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "a" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - receiver = - SelfNode - attributes: - flags = 0 - WriteLocalVariableNode + DefinedWrapperNode attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 + definition = assignment + flags = 1 children: - valueNode = - RubyCallNode + child = + SequenceNode attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PRIVATE - emptyKeywordsProfile = false flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = false - isVCall = true - lastArgIsNotHashProfile = false - methodName = "foo" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false children: - receiver = - SelfNode + body = [ + WriteLocalVariableNode attributes: flags = 0 - OrNodeGen - attributes: - flags = 0 - children: - left = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = false - isSafeNavigation = false - isSplatted = true - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - SplatCastNodeGen - attributes: - conversionMethod = :to_a - copy = false - flags = 0 - nilBehavior = CONVERT + frameSlot = 3 # %value_1 children: - childNode_ = - ReadLocalVariableNode + valueNode = + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false flags = 0 - frameSlot = 3 # %value_1 - type = FRAME_LOCAL - ] - receiver = - ReadLocalVariableNode + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "a" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + WriteLocalVariableNode attributes: flags = 0 frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL - right = - RubyCallNode - attributes: - descriptor = NoKeywordArgumentsDescriptor - dispatchConfig = PROTECTED - emptyKeywordsProfile = false - flags = 0 - isAttrAssign = true - isSafeNavigation = false - isSplatted = true - isVCall = false - lastArgIsNotHashProfile = false - methodName = "[]=" - notEmptyKeywordsProfile = false - notRuby2KeywordsHashProfile = false - children: - arguments = [ - ArrayConcatNode + children: + valueNode = + RubyCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PRIVATE + emptyKeywordsProfile = false + flags = 0 + isAttrAssign = false + isSafeNavigation = false + isSplatted = false + isVCall = true + lastArgIsNotHashProfile = false + methodName = "foo" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + receiver = + SelfNode + attributes: + flags = 0 + OrNodeGen attributes: flags = 0 children: - children = [ - SplatCastNodeGen + left = + RubyCallNode attributes: - conversionMethod = :to_a - copy = true + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false flags = 0 - nilBehavior = CONVERT + isAttrAssign = false + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - childNode_ = + arguments = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = false + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ] + receiver = ReadLocalVariableNode attributes: flags = 0 - frameSlot = 3 # %value_1 + frameSlot = 2 # %opelementassign_0 type = FRAME_LOCAL - ArrayLiteralNode$UninitialisedArrayLiteralNode + right = + RubyCallNode attributes: + descriptor = NoKeywordArgumentsDescriptor + dispatchConfig = PROTECTED + emptyKeywordsProfile = false flags = 0 - language = org.truffleruby.RubyLanguage@... + isAttrAssign = true + isSafeNavigation = false + isSplatted = true + isVCall = false + lastArgIsNotHashProfile = false + methodName = "[]=" + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false children: - values = [ - IntegerFixnumLiteralNode + arguments = [ + ArrayConcatNode attributes: flags = 0 - value = 100500 + children: + children = [ + SplatCastNodeGen + attributes: + conversionMethod = :to_a + copy = true + flags = 0 + nilBehavior = CONVERT + children: + childNode_ = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # %value_1 + type = FRAME_LOCAL + ArrayLiteralNode$UninitialisedArrayLiteralNode + attributes: + flags = 0 + language = org.truffleruby.RubyLanguage@... + children: + values = [ + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 100500 + ] + ] ] - ] + receiver = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # %opelementassign_0 + type = FRAME_LOCAL ] - receiver = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 2 # %opelementassign_0 - type = FRAME_LOCAL ] \ No newline at end of file diff --git a/src/main/java/org/truffleruby/language/constants/WriteConstantNode.java b/src/main/java/org/truffleruby/language/constants/WriteConstantNode.java index f46b0a0053be..0372cc628aae 100644 --- a/src/main/java/org/truffleruby/language/constants/WriteConstantNode.java +++ b/src/main/java/org/truffleruby/language/constants/WriteConstantNode.java @@ -9,9 +9,12 @@ */ package org.truffleruby.language.constants; +import org.truffleruby.RubyContext; +import org.truffleruby.RubyLanguage; import org.truffleruby.core.array.AssignableNode; import org.truffleruby.core.constant.WarnAlreadyInitializedNode; import org.truffleruby.core.module.RubyModule; +import org.truffleruby.core.string.FrozenStrings; import org.truffleruby.language.RubyConstant; import org.truffleruby.language.RubyContextSourceNode; import org.truffleruby.language.RubyNode; @@ -78,6 +81,11 @@ private void warnAlreadyInitializedConstant(RubyModule module, String name, Sour } } + @Override + public Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext context) { + return FrozenStrings.ASSIGNMENT; + } + @Override public AssignableNode toAssignableNode() { this.valueNode = null; diff --git a/src/main/java/org/truffleruby/parser/BodyTranslator.java b/src/main/java/org/truffleruby/parser/BodyTranslator.java index c9af6c5151d4..6fae57dafb75 100644 --- a/src/main/java/org/truffleruby/parser/BodyTranslator.java +++ b/src/main/java/org/truffleruby/parser/BodyTranslator.java @@ -2255,14 +2255,14 @@ public RubyNode visitOpAsgnNode(OpAsgnParseNode node) { node.getOperatorName(), buildArrayNode(pos, node.getValueNode()), null); - final ParseNode writeMethod = new CallParseNode( + final var writeMethod = new CallParseNode( pos, receiverValue.get(pos), node.getVariableName() + "=", buildArrayNode(pos, operation), null); - RubyNode body = writeMethod.accept(this); + RubyNode body = translateCallNode(writeMethod, node.getReceiverNode() instanceof SelfParseNode, false, true); final SourceIndexLength sourceSection = pos; @@ -2272,7 +2272,8 @@ public RubyNode visitOpAsgnNode(OpAsgnParseNode node) { body); body.unsafeSetSourceSection(sourceSection); } - final RubyNode ret = receiverValue.prepareAndThen(sourceSection, body); + final RubyNode sequence = receiverValue.prepareAndThen(sourceSection, body); + final RubyNode ret = new DefinedWrapperNode(language.coreStrings.ASSIGNMENT, sequence); return addNewlineIfNeeded(node, ret); } @@ -2351,6 +2352,7 @@ private RubyNode block(OpElementAsgnParseNode node, ParseNode writeReceiverToTem while (listIterator.hasPrevious()) { ret = listIterator.previous().prepareAndThen(node.getPosition(), ret); } + ret = new DefinedWrapperNode(language.coreStrings.ASSIGNMENT, ret); return addNewlineIfNeeded(node, ret); } diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 6a5ddd35bc51..6c1bdb617ebd 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -864,19 +864,19 @@ public RubyNode visitCallOperatorWriteNode(Nodes.CallOperatorWriteNode node) { executeOperator); final RubyNode writeNode = write.accept(this); - final RubyNode rubyNode; + final RubyNode sequence; if (node.isSafeNavigation()) { // immediately return `nil` if receiver is `nil` final RubyNode unlessNode = UnlessNodeGen.create(new IsNilNode(receiverExpression.getReadNode()), writeNode); - rubyNode = sequence(Arrays.asList(writeReceiverNode, unlessNode)); + sequence = sequence(Arrays.asList(writeReceiverNode, unlessNode)); } else { - rubyNode = sequence(Arrays.asList(writeReceiverNode, writeNode)); + sequence = sequence(Arrays.asList(writeReceiverNode, writeNode)); } - // rubyNode may be already assigned source code in case writeReceiverNode is null - return assignPositionAndFlagsIfMissing(node, rubyNode); + final RubyNode rubyNode = new DefinedWrapperNode(language.coreStrings.ASSIGNMENT, sequence); + return assignPositionAndFlags(node, rubyNode); } @Override @@ -2058,15 +2058,16 @@ public RubyNode visitIndexOperatorWriteNode(Nodes.IndexOperatorWriteNode node) { new Nodes.ArgumentsNode(NO_FLAGS, readArgumentsAndResult, 0, 0), blockArgument, 0, 0); final RubyNode writeNode = write.accept(this); final RubyNode writeArgumentsNode = sequence(Arrays.asList(writeArgumentsNodes)); - final RubyNode rubyNode; + final RubyNode sequence; if (node.block != null) { // add block argument write node - rubyNode = sequence(Arrays.asList(writeArgumentsNode, writeBlockNode, writeReceiverNode, writeNode)); + sequence = sequence(Arrays.asList(writeArgumentsNode, writeBlockNode, writeReceiverNode, writeNode)); } else { - rubyNode = sequence(Arrays.asList(writeArgumentsNode, writeReceiverNode, writeNode)); + sequence = sequence(Arrays.asList(writeArgumentsNode, writeReceiverNode, writeNode)); } + final RubyNode rubyNode = new DefinedWrapperNode(language.coreStrings.ASSIGNMENT, sequence); return assignPositionAndFlags(node, rubyNode); } @@ -2180,15 +2181,16 @@ private RubyNode translateIndexOrAndIndexAndWriteNodes(boolean isAndOperator, No } final RubyNode writeArgumentsNode = sequence(Arrays.asList(writeArgumentsNodes)); - final RubyNode rubyNode; + final RubyNode sequence; if (block != null) { // add block argument write node - rubyNode = sequence(Arrays.asList(writeArgumentsNode, writeBlockNode, writeReceiverNode, operatorNode)); + sequence = sequence(Arrays.asList(writeArgumentsNode, writeBlockNode, writeReceiverNode, operatorNode)); } else { - rubyNode = sequence(Arrays.asList(writeArgumentsNode, writeReceiverNode, operatorNode)); + sequence = sequence(Arrays.asList(writeArgumentsNode, writeReceiverNode, operatorNode)); } + final RubyNode rubyNode = new DefinedWrapperNode(language.coreStrings.ASSIGNMENT, sequence); return rubyNode; } From a96fd1eb33351ce4f79110b3a14965b3f72a0947 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 28 Dec 2023 15:07:01 +0200 Subject: [PATCH 032/131] Fix translation of flip-flop operator within Kernel#eval --- spec/ruby/core/kernel/eval_spec.rb | 9 +++++++++ .../parser/TranslatorEnvironment.java | 17 +++++++++++++++-- .../org/truffleruby/parser/YARPTranslator.java | 8 ++++++-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/spec/ruby/core/kernel/eval_spec.rb b/spec/ruby/core/kernel/eval_spec.rb index 3dfc86336886..1a78cb197c53 100644 --- a/spec/ruby/core/kernel/eval_spec.rb +++ b/spec/ruby/core/kernel/eval_spec.rb @@ -261,6 +261,15 @@ class EvalSpecs end end + it "makes flip-flop operator work correctly" do + ScratchPad.record [] + + eval "10.times { |i| ScratchPad << i if (i == 4)...(i == 4) }" + ScratchPad.recorded.should == [4, 5, 6, 7, 8, 9] + + ScratchPad.clear + end + # See language/magic_comment_spec.rb for more magic comments specs describe "with a magic encoding comment" do it "uses the magic comment encoding for the encoding of literal strings" do diff --git a/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java b/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java index b0a3969c9c1e..87b32155e5be 100644 --- a/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java +++ b/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java @@ -388,8 +388,21 @@ public TranslatorEnvironment getSurroundingMethodEnvironment() { return methodParent; } - /** Used only in tests to make temporary variable names stable and not changed every time they are run. It shouldn't - * be used for anything except that purpose. */ + /** Return either outer method/module/top level environment or in case of eval("...") the topmost environment of the + * parsed (by eval) code */ + public TranslatorEnvironment getSurroundingMethodOrEvalEnvironment() { + TranslatorEnvironment environment = this; + + // eval's parsing environment still has frameDescriptor not initialized, + // but all the outer scopes are related to already parsed code and have initialized frameDescriptor. + while (environment.isBlock() && environment.getParent().frameDescriptor == null) { + environment = environment.getParent(); + } + return environment; + } + + /** Used only in tests to make temporary variable names stable and not changed every time tests are run. It + * shouldn't be used for anything except that purpose. */ public static void resetTemporaryVariablesIndex() { tempIndex.set(0); } diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 6c1bdb617ebd..0b00a6920328 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -3176,11 +3176,15 @@ protected RubyNode defaultVisit(Nodes.Node node) { /** Declare variable in the nearest non-block outer lexical scope - either method, class or top-level */ protected FrameSlotAndDepth createFlipFlopState() { - final var target = environment.getSurroundingMethodEnvironment(); + final var target = environment.getSurroundingMethodOrEvalEnvironment(); final int frameSlot = target.declareLocalTemp("flipflop"); target.getFlipFlopStates().add(frameSlot); - return new FrameSlotAndDepth(frameSlot, environment.getBlockDepth()); + // Relative distance between environments where the local variable is used and is declared. + // In case of eval the target environment is not a method/module/top-level and has its own non-zero depth. + int depth = environment.getBlockDepth() - target.getBlockDepth(); + + return new FrameSlotAndDepth(frameSlot, depth); } /** Translate a list of nodes, e.g. break/return operands, into an array producing node. It returns ArrayLiteralNode From 47bb55531c18dc09449908d9454587a6e9ad1e3b Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 16 Jan 2024 14:58:49 +0200 Subject: [PATCH 033/131] Fix parsing Integer literals with multiple "_" characters The original error to parse literal: "ArgumentError: invalid value for Integer(): 0x0000_0000_0000_0021" --- src/main/java/org/truffleruby/core/string/ConvertBytes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/truffleruby/core/string/ConvertBytes.java b/src/main/java/org/truffleruby/core/string/ConvertBytes.java index d166e91f9e87..74d99ff512cb 100644 --- a/src/main/java/org/truffleruby/core/string/ConvertBytes.java +++ b/src/main/java/org/truffleruby/core/string/ConvertBytes.java @@ -218,7 +218,7 @@ private void squeezeZeroes() { break; } } else { - us += 0; + us = 0; } p++; } From 7e9a9846940e6b4c352b0a6edb72312a12760dee Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 16 Jan 2024 15:24:41 +0200 Subject: [PATCH 034/131] Fix Rational Float literals with 0 in integral part --- .../java/org/truffleruby/parser/YARPTranslator.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 0b00a6920328..d04c58800dd5 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -2749,7 +2749,8 @@ public RubyNode visitRationalNode(Nodes.RationalNode node) { // Translate as Rational.convert(numerator, denominator). // Assume float literal is in the ddd.ddd format and - // scientific format (e.g. 1.23e10) is not valid in Rational literals + // scientific format (e.g. 1.23e10) is not valid in Rational literals. + // Also assume a Float literal could be only decimal (so 0x1.2r literal is invalid). String string = toString(floatNode).replaceAll("_", ""); // remove '_' characters int pointIndex = string.indexOf('.'); assert pointIndex != -1; // float literal in Ruby must contain '.' @@ -2758,7 +2759,7 @@ public RubyNode visitRationalNode(Nodes.RationalNode node) { assert fractionLength > 0; String numerator = string.replace(".", ""); // remove float point - numeratorNode = translateIntegerLiteralString(numerator); + numeratorNode = translateIntegerLiteralString(numerator, 10); // string literal may have leading "0" (e.g. for 0.1r) so specify base explicitly String denominator = "1" + "0".repeat(fractionLength); denominatorNode = translateIntegerLiteralString(denominator); @@ -3850,13 +3851,13 @@ private Arity createArity(Nodes.ParametersNode parametersNode) { // parse Integer literal ourselves // See https://github.com/ruby/yarp/issues/1098 - private RubyNode translateIntegerLiteralString(String string) { + private RubyNode translateIntegerLiteralString(String string, int base) { final RubyNode rubyNode; TruffleString tstring = toTString(string); Object numeratorInteger = ConvertBytes.bytesToInum(RubyLanguage.getCurrentContext(), null, tstring, sourceEncoding, - 0, + base, true); if (numeratorInteger instanceof Integer i) { @@ -3872,4 +3873,8 @@ private RubyNode translateIntegerLiteralString(String string) { return rubyNode; } + private RubyNode translateIntegerLiteralString(String string) { + return translateIntegerLiteralString(string, 0); // detect base automatically + } + } From b861b5c6840cdc42307f77be8e635e510bb2c66f Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 16 Jan 2024 17:14:58 +0200 Subject: [PATCH 035/131] Fix encoding of concatenated String literals In case at least one literal has forced encoding - we should involve encoding negotiation. Code that reproduces the issue: ```ruby accents = "" "\u0300" ``` --- .../truffleruby/parser/YARPTranslator.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index d04c58800dd5..2775a874e11f 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -2314,7 +2314,10 @@ public RubyNode visitInterpolatedRegularExpressionNode(Nodes.InterpolatedRegular @Override public RubyNode visitInterpolatedStringNode(Nodes.InterpolatedStringNode node) { - if (allPartsAreStringNodes(node)) { + // Skip encoding negotiation only if all parts are string literals, and they have + // the same encoding - source file encoding: + // s = "abc" "def" "ghi" + if (allPartsAreStringNodesAndHaveSourceEncoding(node)) { return visitStringNode(concatStringNodes(node)); } @@ -2342,12 +2345,23 @@ public RubyNode visitInterpolatedXStringNode(Nodes.InterpolatedXStringNode node) return assignPositionAndFlags(node, rubyNode); } - private static boolean allPartsAreStringNodes(Nodes.InterpolatedStringNode node) { + private boolean allPartsAreStringNodesAndHaveSourceEncoding(Nodes.InterpolatedStringNode node) { for (var part : node.parts) { - if (!(part instanceof Nodes.StringNode)) { + if (!(part instanceof Nodes.StringNode stringNode)) { + return false; + } + + // check all the possible force-encoding flags - forced encoding should equal the source encoding + + if (stringNode.isForcedBinaryEncoding() && sourceEncoding != Encodings.BINARY) { + return false; + } + + if (stringNode.isForcedUtf8Encoding() && sourceEncoding != Encodings.UTF_8) { return false; } } + return true; } From 4aa808f4310de4f34aed194498ae68a4667d224d Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 16 Jan 2024 18:17:56 +0200 Subject: [PATCH 036/131] Set source location for module/class constants Class/module constant source location could be retrieved with Module.const_source_location --- src/main/java/org/truffleruby/parser/YARPTranslator.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 2775a874e11f..0d9bd8a9a963 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -1096,6 +1096,7 @@ public RubyNode visitClassNode(Nodes.ClassNode node) { } final DefineClassNode defineOrGetClass = new DefineClassNode(node.name, lexicalParent, superClass); + assignPositionOnly(node, defineOrGetClass); // to assign source location to a new constant final RubyNode rubyNode = openModule( node, @@ -2599,6 +2600,7 @@ public RubyNode visitModuleNode(Nodes.ModuleNode node) { final RubyNode lexicalParent = translateCPath(node.constant_path); final DefineModuleNode defineModuleNode = DefineModuleNodeGen.create(node.name, lexicalParent); + assignPositionOnly(node, defineModuleNode); // to assign source location to a new constant final RubyNode rubyNode = openModule( node, From 527bdc6b0d584a372c86ea9fe470484c38a17ec1 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 16 Jan 2024 18:55:34 +0200 Subject: [PATCH 037/131] Tag failed spec in spec/ruby/core/warning/warn_spec.rb Prism doesn't emit such warning yet --- spec/tags/core/warning/warn_tags.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/tags/core/warning/warn_tags.txt b/spec/tags/core/warning/warn_tags.txt index ee2b75c9231d..1c3420d0f3b8 100644 --- a/spec/tags/core/warning/warn_tags.txt +++ b/spec/tags/core/warning/warn_tags.txt @@ -2,3 +2,4 @@ slow:Warning.warn has Warning as the method owner slow:Warning.warn can be overridden slow:Warning.warn does not add a newline slow:Warning.warn returns nil +fails(https://github.com/ruby/prism/issues/2005):Warning.warn is called by parser warnings From 7f768ed3b73d9c086e727098dcf19160e67dba4f Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 16 Jan 2024 20:51:55 +0200 Subject: [PATCH 038/131] Add failing specs for block parameters --- spec/ruby/language/block_spec.rb | 36 +++++++++++++++++++++++++++++++ spec/tags/language/block_tags.txt | 4 ++++ 2 files changed, 40 insertions(+) diff --git a/spec/ruby/language/block_spec.rb b/spec/ruby/language/block_spec.rb index 5aa19ebf6607..e9bd2862d470 100644 --- a/spec/ruby/language/block_spec.rb +++ b/spec/ruby/language/block_spec.rb @@ -701,6 +701,42 @@ def obj.to_ary; raise "Exception raised in #to_ary" end eval("Proc.new { |_,_| }").should be_an_instance_of(Proc) end end + + describe 'pre and post parameters' do + it "assigns nil to unassigned required arguments" do + proc { |a, *b, c, d| [a, b, c, d] }.call(1, 2).should == [1, [], 2, nil] + end + + it "assigns elements to optional arguments" do + proc { |a=5, b=4, c=3| [a, b, c] }.call(1, 2).should == [1, 2, 3] + end + + it "assigns elements to post arguments" do + proc { |a=5, b, c, d| [a, b, c, d] }.call(1, 2).should == [5, 1, 2, nil] + end + + it "assigns elements to pre arguments" do + proc { |a, b, c, d=5| [a, b, c, d] }.call(1, 2).should == [1, 2, nil, 5] + end + + it "assigns elements to pre and post arguments" do + proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1 ).should == [1, 5, 6, nil, nil] + proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1, 2 ).should == [1, 5, 6, 2, nil] + proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1, 2, 3 ).should == [1, 5, 6, 2, 3] + proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1, 2, 3, 4 ).should == [1, 2, 6, 3, 4] + proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1, 2, 3, 4, 5 ).should == [1, 2, 3, 4, 5] + proc { |a, b=5, c=6, d, e| [a, b, c, d, e] }.call(1, 2, 3, 4, 5, 6).should == [1, 2, 3, 4, 5] + end + + it "assigns elements to pre and post arguments when *rest is present" do + proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1 ).should == [1, 5, 6, [], nil, nil] + proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1, 2 ).should == [1, 5, 6, [], 2, nil] + proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1, 2, 3 ).should == [1, 5, 6, [], 2, 3] + proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1, 2, 3, 4 ).should == [1, 2, 6, [], 3, 4] + proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1, 2, 3, 4, 5 ).should == [1, 2, 3, [], 4, 5] + proc { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.call(1, 2, 3, 4, 5, 6).should == [1, 2, 3, [4], 5, 6] + end + end end describe "Block-local variables" do diff --git a/spec/tags/language/block_tags.txt b/spec/tags/language/block_tags.txt index 666e8401d111..e835a23e05a6 100644 --- a/spec/tags/language/block_tags.txt +++ b/spec/tags/language/block_tags.txt @@ -1,3 +1,7 @@ fails:Post-args with optional args with a circular argument reference raises a SyntaxError if using an existing local with the same name as the argument fails:Post-args with optional args with a circular argument reference raises a SyntaxError if there is an existing method with the same name as the argument fails:A block yielded a single Array does not autosplat single argument to required arguments when a keyword rest argument is present +fails:A block pre and post parameters assigns nil to unassigned required arguments +fails:A block pre and post parameters assigns elements to post arguments +fails:A block pre and post parameters assigns elements to pre and post arguments +fails:A block pre and post parameters assigns elements to pre and post arguments when *rest is present From 9163c41a80f7a2a4f64f7002198abe4d0aa293f7 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 16 Jan 2024 20:40:58 +0200 Subject: [PATCH 039/131] Fix block post parameters --- spec/tags/language/block_tags.txt | 4 -- .../with_splat_operator.yaml | 4 ++ .../with_splat_operator_without_name.yaml | 4 ++ .../block/arity/with_splat_operator.yaml | 4 ++ ...meter_and_multiple_required_post_ones.yaml | 4 ++ .../with_splat_operator.yaml | 4 ++ .../with_splat_operator.yaml | 4 ++ .../with_splat_operator_without_name.yaml | 4 ++ .../def/arity/with_splat_operator.yaml | 4 ++ .../with_splat_operator.yaml | 4 ++ .../arguments/ReadPostArgumentNode.java | 52 ++++++++++++++++--- .../parser/LoadArgumentsTranslator.java | 3 +- .../parser/YARPLoadArgumentsTranslator.java | 22 +++++--- 13 files changed, 97 insertions(+), 20 deletions(-) diff --git a/spec/tags/language/block_tags.txt b/spec/tags/language/block_tags.txt index e835a23e05a6..666e8401d111 100644 --- a/spec/tags/language/block_tags.txt +++ b/spec/tags/language/block_tags.txt @@ -1,7 +1,3 @@ fails:Post-args with optional args with a circular argument reference raises a SyntaxError if using an existing local with the same name as the argument fails:Post-args with optional args with a circular argument reference raises a SyntaxError if there is an existing method with the same name as the argument fails:A block yielded a single Array does not autosplat single argument to required arguments when a keyword rest argument is present -fails:A block pre and post parameters assigns nil to unassigned required arguments -fails:A block pre and post parameters assigns elements to post arguments -fails:A block pre and post parameters assigns elements to pre and post arguments -fails:A block pre and post parameters assigns elements to pre and post arguments when *rest is present diff --git a/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator.yaml b/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator.yaml index 4d4ce485d260..550caf591bc1 100644 --- a/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator.yaml +++ b/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator.yaml @@ -181,8 +181,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 1 keywordArguments = false + optional = 0 required = 4 WriteLocalVariableNode attributes: @@ -193,8 +195,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 2 keywordArguments = false + optional = 0 required = 4 ] thenBody = diff --git a/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator_without_name.yaml b/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator_without_name.yaml index 6b9ba8967327..cfcdc054a7ea 100644 --- a/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator_without_name.yaml +++ b/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator_without_name.yaml @@ -182,8 +182,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 1 keywordArguments = false + optional = 0 required = 4 WriteLocalVariableNode attributes: @@ -194,8 +196,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 2 keywordArguments = false + optional = 0 required = 4 ] thenBody = diff --git a/spec/truffle/parsing/fixtures/block/arity/with_splat_operator.yaml b/spec/truffle/parsing/fixtures/block/arity/with_splat_operator.yaml index db7c1f26dfba..f64ad5a8ffe9 100644 --- a/spec/truffle/parsing/fixtures/block/arity/with_splat_operator.yaml +++ b/spec/truffle/parsing/fixtures/block/arity/with_splat_operator.yaml @@ -184,8 +184,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 1 keywordArguments = false + optional = 0 required = 4 WriteLocalVariableNode attributes: @@ -196,8 +198,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 2 keywordArguments = false + optional = 0 required = 4 ] thenBody = diff --git a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_rest_positional_parameter_and_multiple_required_post_ones.yaml b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_rest_positional_parameter_and_multiple_required_post_ones.yaml index ae952d385bf1..d77d1c0dd04c 100644 --- a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_rest_positional_parameter_and_multiple_required_post_ones.yaml +++ b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_rest_positional_parameter_and_multiple_required_post_ones.yaml @@ -180,8 +180,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 1 keywordArguments = false + optional = 0 required = 2 WriteLocalVariableNode attributes: @@ -192,8 +194,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 2 keywordArguments = false + optional = 0 required = 2 ] thenBody = diff --git a/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_splat_operator.yaml b/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_splat_operator.yaml index 9c6ec25a95e8..9ab05dd8958f 100644 --- a/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_splat_operator.yaml +++ b/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_splat_operator.yaml @@ -194,8 +194,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 1 keywordArguments = false + optional = 0 required = 4 WriteLocalVariableNode attributes: @@ -206,8 +208,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 2 keywordArguments = false + optional = 0 required = 4 ] thenBody = diff --git a/spec/truffle/parsing/fixtures/def/argument_descriptors/with_splat_operator.yaml b/spec/truffle/parsing/fixtures/def/argument_descriptors/with_splat_operator.yaml index a9f83cd54170..5845e4e760a6 100644 --- a/spec/truffle/parsing/fixtures/def/argument_descriptors/with_splat_operator.yaml +++ b/spec/truffle/parsing/fixtures/def/argument_descriptors/with_splat_operator.yaml @@ -120,8 +120,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 1 keywordArguments = false + optional = 0 required = 4 WriteLocalVariableNode attributes: @@ -132,8 +134,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 2 keywordArguments = false + optional = 0 required = 4 NilLiteralNode attributes: diff --git a/spec/truffle/parsing/fixtures/def/argument_descriptors/with_splat_operator_without_name.yaml b/spec/truffle/parsing/fixtures/def/argument_descriptors/with_splat_operator_without_name.yaml index a2d8e952213b..1e465aaf838e 100644 --- a/spec/truffle/parsing/fixtures/def/argument_descriptors/with_splat_operator_without_name.yaml +++ b/spec/truffle/parsing/fixtures/def/argument_descriptors/with_splat_operator_without_name.yaml @@ -120,8 +120,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 1 keywordArguments = false + optional = 0 required = 4 WriteLocalVariableNode attributes: @@ -132,8 +134,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 2 keywordArguments = false + optional = 0 required = 4 NilLiteralNode attributes: diff --git a/spec/truffle/parsing/fixtures/def/arity/with_splat_operator.yaml b/spec/truffle/parsing/fixtures/def/arity/with_splat_operator.yaml index 62ad8a1d602a..47003f074769 100644 --- a/spec/truffle/parsing/fixtures/def/arity/with_splat_operator.yaml +++ b/spec/truffle/parsing/fixtures/def/arity/with_splat_operator.yaml @@ -123,8 +123,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 1 keywordArguments = false + optional = 0 required = 4 WriteLocalVariableNode attributes: @@ -135,8 +137,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 2 keywordArguments = false + optional = 0 required = 4 NilLiteralNode attributes: diff --git a/spec/truffle/parsing/fixtures/def/parameters_to_local_variables/with_splat_operator.yaml b/spec/truffle/parsing/fixtures/def/parameters_to_local_variables/with_splat_operator.yaml index 9b88d0085499..ca82a8f560e0 100644 --- a/spec/truffle/parsing/fixtures/def/parameters_to_local_variables/with_splat_operator.yaml +++ b/spec/truffle/parsing/fixtures/def/parameters_to_local_variables/with_splat_operator.yaml @@ -133,8 +133,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 1 keywordArguments = false + optional = 0 required = 4 WriteLocalVariableNode attributes: @@ -145,8 +147,10 @@ ast: | ReadPostArgumentNode attributes: flags = 0 + hasRest = true indexFromCount = 2 keywordArguments = false + optional = 0 required = 4 NilLiteralNode attributes: diff --git a/src/main/java/org/truffleruby/language/arguments/ReadPostArgumentNode.java b/src/main/java/org/truffleruby/language/arguments/ReadPostArgumentNode.java index a438c97e7dc9..7d2aab07e78d 100644 --- a/src/main/java/org/truffleruby/language/arguments/ReadPostArgumentNode.java +++ b/src/main/java/org/truffleruby/language/arguments/ReadPostArgumentNode.java @@ -18,26 +18,62 @@ public final class ReadPostArgumentNode extends RubyContextSourceNode { private final int indexFromCount; - private final boolean keywordArguments; private final int required; + private final int optional; + private final boolean hasRest; + private final boolean keywordArguments; private final ConditionProfile enoughArguments = ConditionProfile.create(); - public ReadPostArgumentNode(int indexFromCount, boolean keywordArguments, int required) { + public ReadPostArgumentNode( + int indexFromCount, + int required, + int optional, + boolean hasRest, + boolean keywordArguments) { this.indexFromCount = indexFromCount; - this.keywordArguments = keywordArguments; this.required = required; + this.optional = optional; + this.hasRest = hasRest; + this.keywordArguments = keywordArguments; } @Override public Object execute(VirtualFrame frame) { - final int positionalArgumentsCount = RubyArguments.getPositionalArgumentsCount(frame, keywordArguments); + final int length = RubyArguments.getPositionalArgumentsCount(frame, keywordArguments); + + // required parameters - parameters before optional/rest and parameters after them + if (enoughArguments.profile(length >= required)) { + final int effectiveIndex; + + if (hasRest || length <= optional + required) { + // rest parameter/optional parameters consume **all** the extra arguments + // and post parameters consume trailing arguments: + // proc { |a, *b, c, d| [a, b, c, d] }.call(1, 2, 3, 4) # => [1, [2], 3, 4] + // proc { |a, b=:b, c=:c, d| [a, b, c, d] }.call(1, 2, 3, 4) # => [1, 2, 3, 4] + // proc { |a, b=:b, c=:c, d| [a, b, c, d] }.call(1, 2, 3) # => [1, 2, :c, 3] + effectiveIndex = length - indexFromCount; + } else { + // optional and post parameters are fulfilled, extra arguments - skipped: + // proc { |a, b=:b, c| [a, b, c] }.call(1, 2, 3, 4) # => [1, 2, 3] + effectiveIndex = optional + required - indexFromCount; + } - if (enoughArguments.profile(positionalArgumentsCount >= required)) { - final int effectiveIndex = positionalArgumentsCount - indexFromCount; return RubyArguments.getArgument(frame, effectiveIndex); } else { // CheckArityNode will prevent this case for methods & lambdas, but it is still possible for procs. - return nil; + + // it's the simplest case: + // - optional and rest parameters don't capture anything + // - pre and post parameters capture arguments from left to right: + // proc { |a, b=:b, *c, d, e| [a, b, c, d, e] }.call(1, 2) # => [1, :b, [], 2, nil] + + final int effectiveIndex = required - indexFromCount; + + if (effectiveIndex < length) { + return RubyArguments.getArgument(frame, effectiveIndex); + } else { + return nil; + } } } @@ -48,7 +84,7 @@ public String toString() { @Override public RubyNode cloneUninitialized() { - var copy = new ReadPostArgumentNode(indexFromCount, keywordArguments, required); + var copy = new ReadPostArgumentNode(indexFromCount, required, optional, hasRest, keywordArguments); return copy.copyFlags(this); } diff --git a/src/main/java/org/truffleruby/parser/LoadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/LoadArgumentsTranslator.java index 24988eaf4228..153cf8e7d2c5 100644 --- a/src/main/java/org/truffleruby/parser/LoadArgumentsTranslator.java +++ b/src/main/java/org/truffleruby/parser/LoadArgumentsTranslator.java @@ -309,7 +309,8 @@ private RubyNode readArgument(SourceIndexLength sourceSection) { hasKeywordArguments, isProc ? MissingArgumentBehavior.NIL : MissingArgumentBehavior.RUNTIME_ERROR)); } else if (state == State.POST) { - return new ReadPostArgumentNode(-index, hasKeywordArguments, required); + return new ReadPostArgumentNode(-index, required, argsNode.getOptionalArgsCount(), + argsNode.hasRestArg(), hasKeywordArguments); } else { throw new IllegalStateException(); } diff --git a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java index 35770b963331..0ea36018b36d 100644 --- a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java @@ -45,7 +45,7 @@ private enum State { private final Nodes.ParametersNode parameters; private int index; // position of actual argument in a frame that is being evaluated/read - // to match a read node and actual argument + // to match a read node and actual argument private State state; // to distinguish pre and post Nodes.RequiredParameterNode parameters private final RubyLanguage language; @@ -125,10 +125,8 @@ private RubyNode translateWithParameters() { } } - if (hasKeywordArguments()) { - for (var node : parameters.keywords) { - sequence.add(node.accept(this)); // Nodes.RequiredKeywordParameterNode/Nodes.OptionalKeywordParameterNode are expected here - } + for (var node : parameters.keywords) { + sequence.add(node.accept(this)); // Nodes.RequiredKeywordParameterNode/Nodes.OptionalKeywordParameterNode are expected here } if (parameters.keyword_rest != null) { @@ -172,7 +170,8 @@ public RubyNode visitMultiTargetNode(Nodes.MultiTargetNode node) { isProc ? MissingArgumentBehavior.NIL : MissingArgumentBehavior.RUNTIME_ERROR)); } else if (state == YARPLoadArgumentsTranslator.State.POST) { - readNode = new ReadPostArgumentNode(-index, hasKeywordArguments(), getRequiredCount()); + readNode = new ReadPostArgumentNode(-index, getRequiredCount(), getOptionalCount(), hasRest(), + hasKeywordArguments()); } else { throw new IllegalStateException(); } @@ -204,7 +203,8 @@ public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) { isProc ? MissingArgumentBehavior.NIL : MissingArgumentBehavior.RUNTIME_ERROR)); } else if (state == YARPLoadArgumentsTranslator.State.POST) { - readNode = new ReadPostArgumentNode(-index, hasKeywordArguments(), getRequiredCount()); + readNode = new ReadPostArgumentNode(-index, getRequiredCount(), getOptionalCount(), hasRest(), + hasKeywordArguments()); } else { throw new IllegalStateException(); } @@ -322,8 +322,16 @@ private int getRequiredCount() { return parameters.requireds.length + parameters.posts.length; } + private int getOptionalCount() { + return parameters.optionals.length; + } + private boolean hasKeywordArguments() { return parameters.keywords.length != 0 || parameters.keyword_rest != null; } + private boolean hasRest() { + return parameters.rest != null; + } + } From e3dd15996e65dc3bf7542646883a48c476b29165 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Tue, 16 Jan 2024 14:59:17 +0200 Subject: [PATCH 040/131] Add specs for block pre and post parameters at destructuring a single Array argument --- spec/ruby/language/block_spec.rb | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/spec/ruby/language/block_spec.rb b/spec/ruby/language/block_spec.rb index e9bd2862d470..fc46c12682cc 100644 --- a/spec/ruby/language/block_spec.rb +++ b/spec/ruby/language/block_spec.rb @@ -40,6 +40,28 @@ def m(a) yield a end m([1, 2]) { |a=5, b, c, d| [a, b, c, d] }.should == [5, 1, 2, nil] end + it "assigns elements to pre arguments" do + m([1, 2]) { |a, b, c, d=5| [a, b, c, d] }.should == [1, 2, nil, 5] + end + + it "assigns elements to pre and post arguments" do + m([1 ]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 5, 6, nil, nil] + m([1, 2 ]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 5, 6, 2, nil] + m([1, 2, 3 ]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 5, 6, 2, 3] + m([1, 2, 3, 4 ]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 2, 6, 3, 4] + m([1, 2, 3, 4, 5 ]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 2, 3, 4, 5] + m([1, 2, 3, 4, 5, 6]) { |a, b=5, c=6, d, e| [a, b, c, d, e] }.should == [1, 2, 3, 4, 5] + end + + it "assigns elements to pre and post arguments when *rest is present" do + m([1 ]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 5, 6, [], nil, nil] + m([1, 2 ]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 5, 6, [], 2, nil] + m([1, 2, 3 ]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 5, 6, [], 2, 3] + m([1, 2, 3, 4 ]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 2, 6, [], 3, 4] + m([1, 2, 3, 4, 5 ]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 2, 3, [], 4, 5] + m([1, 2, 3, 4, 5, 6]) { |a, b=5, c=6, *d, e, f| [a, b, c, d, e, f] }.should == [1, 2, 3, [4], 5, 6] + end + ruby_version_is "3.2" do it "does not autosplat single argument to required arguments when a keyword rest argument is present" do m([1, 2]) { |a, **k| [a, k] }.should == [[1, 2], {}] @@ -368,7 +390,6 @@ def obj.to_ary; raise "Exception raised in #to_ary" end -> { @y.s(obj) { |a, b| } }.should raise_error(ZeroDivisionError) end - end describe "taking |a, *b| arguments" do From ce78bc991ac8511dda4e665b30413133a00e960b Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Wed, 17 Jan 2024 18:33:24 +0200 Subject: [PATCH 041/131] Fix block parameters when a single array argument is being destructured --- .../with_optional_positional_parameters.yaml | 65 +++-------- .../with_splat_operator.yaml | 18 ++-- .../with_splat_operator_without_name.yaml | 18 ++-- .../with_optional_positional_parameters.yaml | 65 +++-------- .../block/arity/with_splat_operator.yaml | 18 ++-- ..._parameter_but_multiple_optional_ones.yaml | 70 ++++-------- ...ngle_required_and_single_optional_one.yaml | 42 +++----- ...meter_and_multiple_required_post_ones.yaml | 18 ++-- ...rator_presents_and_should_destructure.yaml | 11 +- ...uments_present_and_should_destructure.yaml | 15 +-- .../with_optional_positional_parameters.yaml | 74 ++++--------- .../with_splat_operator.yaml | 18 ++-- ...eadBlockOptionalArgumentFromArrayNode.java | 72 +++++++++++++ .../ReadBlockPostArgumentFromArrayNode.java | 93 ++++++++++++++++ .../arguments/ReadOptionalArgumentNode.java | 2 + .../parser/YARPBlockNodeTranslator.java | 1 - ...ParametersNodeToDestructureTranslator.java | 102 ++++++++++++------ 17 files changed, 392 insertions(+), 310 deletions(-) create mode 100644 src/main/java/org/truffleruby/language/arguments/ReadBlockOptionalArgumentFromArrayNode.java create mode 100644 src/main/java/org/truffleruby/language/arguments/ReadBlockPostArgumentFromArrayNode.java diff --git a/spec/truffle/parsing/fixtures/block/argument_descriptors/with_optional_positional_parameters.yaml b/spec/truffle/parsing/fixtures/block/argument_descriptors/with_optional_positional_parameters.yaml index 3fa4cf674124..45c62fc98d67 100644 --- a/spec/truffle/parsing/fixtures/block/argument_descriptors/with_optional_positional_parameters.yaml +++ b/spec/truffle/parsing/fixtures/block/argument_descriptors/with_optional_positional_parameters.yaml @@ -7,6 +7,7 @@ notes: > - ArgumentDescriptor(name = c, type = opt) So the optional positional arguments are described as `opt` variables. +yarp_specific: true # use ReadBlockOptionalArgumentFromArrayNode for optional parameters at destructuring single Array argument focused_on_node: "org.truffleruby.language.methods.BlockDefinitionNode" ruby: | proc do |a, b=42, c=100500| @@ -219,78 +220,46 @@ ast: | frameSlot = 2 # b children: valueNode = - IfElseNodeGen + ReadBlockOptionalArgumentFromArrayNode attributes: flags = 0 + index = 1 + minimum = 2 children: - condition = - ArrayIsAtLeastAsLargeAsNode - attributes: - flags = 0 - requiredSize = 2 - children: - child = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL - elseBody = + defaultValue = IntegerFixnumLiteralNode attributes: flags = 0 value = 42 - thenBody = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + readArrayNode = + ReadLocalVariableNode attributes: flags = 0 - index = 1 - children: - arrayNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL + frameSlot = 4 # %destructure_1 + type = FRAME_LOCAL WriteLocalVariableNode attributes: flags = 0 frameSlot = 3 # c children: valueNode = - IfElseNodeGen + ReadBlockOptionalArgumentFromArrayNode attributes: flags = 0 + index = 2 + minimum = 3 children: - condition = - ArrayIsAtLeastAsLargeAsNode - attributes: - flags = 0 - requiredSize = 3 - children: - child = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL - elseBody = + defaultValue = IntegerFixnumLiteralNode attributes: flags = 0 value = 100500 - thenBody = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + readArrayNode = + ReadLocalVariableNode attributes: flags = 0 - index = 2 - children: - arrayNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL + frameSlot = 4 # %destructure_1 + type = FRAME_LOCAL ] NilLiteralNode attributes: diff --git a/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator.yaml b/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator.yaml index 550caf591bc1..54f7e34525ef 100644 --- a/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator.yaml +++ b/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator.yaml @@ -279,12 +279,15 @@ ast: | frameSlot = 5 # f children: valueNode = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + ReadBlockPostArgumentFromArrayNode attributes: flags = 0 - index = -1 + hasRest = true + indexFromCount = 1 + optional = 0 + required = 4 children: - arrayNode_ = + readArrayNode = ReadLocalVariableNode attributes: flags = 0 @@ -296,12 +299,15 @@ ast: | frameSlot = 4 # d children: valueNode = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + ReadBlockPostArgumentFromArrayNode attributes: flags = 0 - index = -2 + hasRest = true + indexFromCount = 2 + optional = 0 + required = 4 children: - arrayNode_ = + readArrayNode = ReadLocalVariableNode attributes: flags = 0 diff --git a/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator_without_name.yaml b/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator_without_name.yaml index cfcdc054a7ea..aa232168fea6 100644 --- a/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator_without_name.yaml +++ b/spec/truffle/parsing/fixtures/block/argument_descriptors/with_splat_operator_without_name.yaml @@ -280,12 +280,15 @@ ast: | frameSlot = 4 # f children: valueNode = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + ReadBlockPostArgumentFromArrayNode attributes: flags = 0 - index = -1 + hasRest = true + indexFromCount = 1 + optional = 0 + required = 4 children: - arrayNode_ = + readArrayNode = ReadLocalVariableNode attributes: flags = 0 @@ -297,12 +300,15 @@ ast: | frameSlot = 3 # d children: valueNode = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + ReadBlockPostArgumentFromArrayNode attributes: flags = 0 - index = -2 + hasRest = true + indexFromCount = 2 + optional = 0 + required = 4 children: - arrayNode_ = + readArrayNode = ReadLocalVariableNode attributes: flags = 0 diff --git a/spec/truffle/parsing/fixtures/block/arity/with_optional_positional_parameters.yaml b/spec/truffle/parsing/fixtures/block/arity/with_optional_positional_parameters.yaml index 4b0ab4ed2541..3a0680e0d9d6 100644 --- a/spec/truffle/parsing/fixtures/block/arity/with_optional_positional_parameters.yaml +++ b/spec/truffle/parsing/fixtures/block/arity/with_optional_positional_parameters.yaml @@ -11,6 +11,7 @@ notes: > - hasKeywordsRest=false So the optional positional parameters are reflected in the `optional=2` attribute. +yarp_specific: true # use ReadBlockOptionalArgumentFromArrayNode for optional parameters at destructuring single Array argument focused_on_node: "org.truffleruby.language.methods.BlockDefinitionNode" ruby: | proc do |a, b=42, c=100500| @@ -223,78 +224,46 @@ ast: | frameSlot = 2 # b children: valueNode = - IfElseNodeGen + ReadBlockOptionalArgumentFromArrayNode attributes: flags = 0 + index = 1 + minimum = 2 children: - condition = - ArrayIsAtLeastAsLargeAsNode - attributes: - flags = 0 - requiredSize = 2 - children: - child = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL - elseBody = + defaultValue = IntegerFixnumLiteralNode attributes: flags = 0 value = 42 - thenBody = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + readArrayNode = + ReadLocalVariableNode attributes: flags = 0 - index = 1 - children: - arrayNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL + frameSlot = 4 # %destructure_1 + type = FRAME_LOCAL WriteLocalVariableNode attributes: flags = 0 frameSlot = 3 # c children: valueNode = - IfElseNodeGen + ReadBlockOptionalArgumentFromArrayNode attributes: flags = 0 + index = 2 + minimum = 3 children: - condition = - ArrayIsAtLeastAsLargeAsNode - attributes: - flags = 0 - requiredSize = 3 - children: - child = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL - elseBody = + defaultValue = IntegerFixnumLiteralNode attributes: flags = 0 value = 100500 - thenBody = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + readArrayNode = + ReadLocalVariableNode attributes: flags = 0 - index = 2 - children: - arrayNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL + frameSlot = 4 # %destructure_1 + type = FRAME_LOCAL ] NilLiteralNode attributes: diff --git a/spec/truffle/parsing/fixtures/block/arity/with_splat_operator.yaml b/spec/truffle/parsing/fixtures/block/arity/with_splat_operator.yaml index f64ad5a8ffe9..7201654284ae 100644 --- a/spec/truffle/parsing/fixtures/block/arity/with_splat_operator.yaml +++ b/spec/truffle/parsing/fixtures/block/arity/with_splat_operator.yaml @@ -282,12 +282,15 @@ ast: | frameSlot = 5 # f children: valueNode = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + ReadBlockPostArgumentFromArrayNode attributes: flags = 0 - index = -1 + hasRest = true + indexFromCount = 1 + optional = 0 + required = 4 children: - arrayNode_ = + readArrayNode = ReadLocalVariableNode attributes: flags = 0 @@ -299,12 +302,15 @@ ast: | frameSlot = 4 # d children: valueNode = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + ReadBlockPostArgumentFromArrayNode attributes: flags = 0 - index = -2 + hasRest = true + indexFromCount = 2 + optional = 0 + required = 4 children: - arrayNode_ = + readArrayNode = ReadLocalVariableNode attributes: flags = 0 diff --git a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_no_rest_positional_parameter_but_multiple_optional_ones.yaml b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_no_rest_positional_parameter_but_multiple_optional_ones.yaml index c3c05842f4d1..07e18a870f52 100644 --- a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_no_rest_positional_parameter_but_multiple_optional_ones.yaml +++ b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_no_rest_positional_parameter_but_multiple_optional_ones.yaml @@ -17,6 +17,11 @@ notes: > (SequenceNode # then branch (WriteLocalVariableNode frameSlot = 1 + (ReadBlockOptionalArgumentFromArrayNode + (ReadLocalVariableNode frameSlot = 3) # %destructure_1 + (IntegerFixnumLiteralNode value = 42)) # default value + + (IfElseNode (ArrayIsAtLeastAsLargeAsNode requiredSize = 1 # condition (ReadLocalVariableNode frameSlot = 3)) @@ -34,6 +39,7 @@ notes: > ordinal parameters processing without destructing # else branch ) +yarp_specific: true # use ReadBlockOptionalArgumentFromArrayNode for optional parameters at destructuring single Array argument focused_on_node: "org.truffleruby.language.methods.BlockDefinitionNode" ruby: | proc do |foo = 42, bar = 100500| @@ -212,78 +218,46 @@ ast: | frameSlot = 1 # foo children: valueNode = - IfElseNodeGen + ReadBlockOptionalArgumentFromArrayNode attributes: flags = 0 + index = 0 + minimum = 1 children: - condition = - ArrayIsAtLeastAsLargeAsNode - attributes: - flags = 0 - requiredSize = 1 - children: - child = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %destructure_1 - type = FRAME_LOCAL - elseBody = + defaultValue = IntegerFixnumLiteralNode attributes: flags = 0 value = 42 - thenBody = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + readArrayNode = + ReadLocalVariableNode attributes: flags = 0 - index = 0 - children: - arrayNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %destructure_1 - type = FRAME_LOCAL + frameSlot = 3 # %destructure_1 + type = FRAME_LOCAL WriteLocalVariableNode attributes: flags = 0 frameSlot = 2 # bar children: valueNode = - IfElseNodeGen + ReadBlockOptionalArgumentFromArrayNode attributes: flags = 0 + index = 1 + minimum = 2 children: - condition = - ArrayIsAtLeastAsLargeAsNode - attributes: - flags = 0 - requiredSize = 2 - children: - child = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %destructure_1 - type = FRAME_LOCAL - elseBody = + defaultValue = IntegerFixnumLiteralNode attributes: flags = 0 value = 100500 - thenBody = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + readArrayNode = + ReadLocalVariableNode attributes: flags = 0 - index = 1 - children: - arrayNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %destructure_1 - type = FRAME_LOCAL + frameSlot = 3 # %destructure_1 + type = FRAME_LOCAL ] NilLiteralNode attributes: diff --git a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_no_rest_positional_parameter_but_single_required_and_single_optional_one.yaml b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_no_rest_positional_parameter_but_single_required_and_single_optional_one.yaml index 2112feeb1a13..22919937c63a 100644 --- a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_no_rest_positional_parameter_but_single_required_and_single_optional_one.yaml +++ b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_no_rest_positional_parameter_but_single_required_and_single_optional_one.yaml @@ -20,15 +20,13 @@ notes: > (ArrayIndexNodesFactory$ReadConstantIndexNodeGen index = 0 (ReadLocalVariableNode frameSlot = 3))) (WriteLocalVariableNode frameSlot = 2 - (IfElseNode - (ArrayIsAtLeastAsLargeAsNode requiredSize = 2 # condition - (ReadLocalVariableNode frameSlot = 3)) - (ArrayIndexNodesFactory$ReadConstantIndexNodeGen index = 1) # then - (ReadLocalVariableNode frameSlot = 3)) - (IntegerFixnumLiteralNode value = 42))) # else + (ReadBlockOptionalArgumentFromArrayNode index = 1 + (ReadLocalVariableNode frameSlot = 3) # %destructure_1 + (IntegerFixnumLiteralNode value = 42))) # default ordinal parameters processing without destructing # else branch ) +yarp_specific: true # use ReadBlockOptionalArgumentFromArrayNode for optional parameters at destructuring single Array argument focused_on_node: "org.truffleruby.language.methods.BlockDefinitionNode" ruby: | proc do |foo, bar = 42| @@ -223,39 +221,23 @@ ast: | frameSlot = 2 # bar children: valueNode = - IfElseNodeGen + ReadBlockOptionalArgumentFromArrayNode attributes: flags = 0 + index = 1 + minimum = 2 children: - condition = - ArrayIsAtLeastAsLargeAsNode - attributes: - flags = 0 - requiredSize = 2 - children: - child = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %destructure_1 - type = FRAME_LOCAL - elseBody = + defaultValue = IntegerFixnumLiteralNode attributes: flags = 0 value = 42 - thenBody = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + readArrayNode = + ReadLocalVariableNode attributes: flags = 0 - index = 1 - children: - arrayNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 3 # %destructure_1 - type = FRAME_LOCAL + frameSlot = 3 # %destructure_1 + type = FRAME_LOCAL ] NilLiteralNode attributes: diff --git a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_rest_positional_parameter_and_multiple_required_post_ones.yaml b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_rest_positional_parameter_and_multiple_required_post_ones.yaml index d77d1c0dd04c..d533e3900661 100644 --- a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_rest_positional_parameter_and_multiple_required_post_ones.yaml +++ b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/destructure/when_rest_positional_parameter_and_multiple_required_post_ones.yaml @@ -244,12 +244,15 @@ ast: | frameSlot = 3 # bar children: valueNode = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + ReadBlockPostArgumentFromArrayNode attributes: flags = 0 - index = -1 + hasRest = true + indexFromCount = 1 + optional = 0 + required = 2 children: - arrayNode_ = + readArrayNode = ReadLocalVariableNode attributes: flags = 0 @@ -261,12 +264,15 @@ ast: | frameSlot = 2 # foo children: valueNode = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + ReadBlockPostArgumentFromArrayNode attributes: flags = 0 - index = -2 + hasRest = true + indexFromCount = 2 + optional = 0 + required = 2 children: - arrayNode_ = + readArrayNode = ReadLocalVariableNode attributes: flags = 0 diff --git a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/when_double_splat_operator_presents_and_should_destructure.yaml b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/when_double_splat_operator_presents_and_should_destructure.yaml index aa5333307a09..b78279c8d750 100644 --- a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/when_double_splat_operator_presents_and_should_destructure.yaml +++ b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/when_double_splat_operator_presents_and_should_destructure.yaml @@ -6,6 +6,7 @@ notes: > (WriteLocalVariableNode frameSlot = 3 (ReadKeywordRestArgumentNode)) +yarp_specific: true # use EmptyHashStore$EmptyHashLiteralNode as value of key rest parameter at destructuring single Array argument focused_on_node: "org.truffleruby.language.methods.BlockDefinitionNode" ruby: | proc do |a, b, **c| @@ -233,17 +234,9 @@ ast: | frameSlot = 3 # c children: valueNode = - ReadKeywordRestArgumentNode + EmptyHashStore$EmptyHashLiteralNode attributes: - excludedKeywords = [] flags = 0 - children: - hashes = - HashStoreLibraryGen$CachedDispatchFirst - attributes: - limit_ = 3 - readUserKeywordsHashNode = - ReadUserKeywordsHashNode ] NilLiteralNode attributes: diff --git a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/when_optional_keyword_arguments_present_and_should_destructure.yaml b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/when_optional_keyword_arguments_present_and_should_destructure.yaml index ecd0c5dcc9dc..33e3007d5e86 100644 --- a/spec/truffle/parsing/fixtures/block/destructuring_array_argument/when_optional_keyword_arguments_present_and_should_destructure.yaml +++ b/spec/truffle/parsing/fixtures/block/destructuring_array_argument/when_optional_keyword_arguments_present_and_should_destructure.yaml @@ -7,6 +7,7 @@ notes: > (WriteLocalVariableNode frameSlot = 3 (ReadKeywordArgumentNodeGen name = :c (StringLiteralNode tstring = c))) # defaultValue +yarp_specific: true # change how optional keyword argument is handled and assign default value (StringLiteralNode) directly at destructuring single Array argument focused_on_node: "org.truffleruby.language.methods.BlockDefinitionNode" ruby: | proc do |a, b, c: 'c'| @@ -236,19 +237,11 @@ ast: | frameSlot = 3 # c children: valueNode = - ReadKeywordArgumentNodeGen + StringLiteralNode attributes: + encoding = UTF-8 flags = 0 - name = :c - children: - defaultValue = - StringLiteralNode - attributes: - encoding = UTF-8 - flags = 0 - tstring = c - readUserKeywordsHashNode = - ReadUserKeywordsHashNode + tstring = c ] NilLiteralNode attributes: diff --git a/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_optional_positional_parameters.yaml b/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_optional_positional_parameters.yaml index b03c6b1f1f57..2a3d15162b90 100644 --- a/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_optional_positional_parameters.yaml +++ b/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_optional_positional_parameters.yaml @@ -4,12 +4,12 @@ notes: > Optional positional parameter is assigned to a local variable with the following simplified AST: - (WriteLocalVariableNode - 2 # frameSlot - (ReadOptionalArgumentNode - 1 # index - (IntegerFixnumLiteralNode 42))) # defaultValue + (WriteLocalVariableNode frameSlot = 2 + (ReadBlockOptionalArgumentFromArrayNode index = 1 + (ReadLocalVariableNode frameSlot = 4) # %destructure_1 + (IntegerFixnumLiteralNode 42))) # defaultValue +yarp_specific: true # use ReadBlockOptionalArgumentFromArrayNode for optional parameters at destructuring single Array argument focused_on_node: "org.truffleruby.language.methods.BlockDefinitionNode" ruby: | proc do |a, b=42, c=100500| @@ -222,78 +222,46 @@ ast: | frameSlot = 2 # b children: valueNode = - IfElseNodeGen + ReadBlockOptionalArgumentFromArrayNode attributes: flags = 0 + index = 1 + minimum = 2 children: - condition = - ArrayIsAtLeastAsLargeAsNode - attributes: - flags = 0 - requiredSize = 2 - children: - child = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL - elseBody = + defaultValue = IntegerFixnumLiteralNode attributes: flags = 0 value = 42 - thenBody = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + readArrayNode = + ReadLocalVariableNode attributes: flags = 0 - index = 1 - children: - arrayNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL + frameSlot = 4 # %destructure_1 + type = FRAME_LOCAL WriteLocalVariableNode attributes: flags = 0 frameSlot = 3 # c children: valueNode = - IfElseNodeGen + ReadBlockOptionalArgumentFromArrayNode attributes: flags = 0 + index = 2 + minimum = 3 children: - condition = - ArrayIsAtLeastAsLargeAsNode - attributes: - flags = 0 - requiredSize = 3 - children: - child = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL - elseBody = + defaultValue = IntegerFixnumLiteralNode attributes: flags = 0 value = 100500 - thenBody = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + readArrayNode = + ReadLocalVariableNode attributes: flags = 0 - index = 2 - children: - arrayNode_ = - ReadLocalVariableNode - attributes: - flags = 0 - frameSlot = 4 # %destructure_1 - type = FRAME_LOCAL + frameSlot = 4 # %destructure_1 + type = FRAME_LOCAL ] NilLiteralNode attributes: diff --git a/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_splat_operator.yaml b/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_splat_operator.yaml index 9ab05dd8958f..ac12f83ea1cf 100644 --- a/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_splat_operator.yaml +++ b/spec/truffle/parsing/fixtures/block/parameters_to_local_variables/with_splat_operator.yaml @@ -292,12 +292,15 @@ ast: | frameSlot = 5 # f children: valueNode = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + ReadBlockPostArgumentFromArrayNode attributes: flags = 0 - index = -1 + hasRest = true + indexFromCount = 1 + optional = 0 + required = 4 children: - arrayNode_ = + readArrayNode = ReadLocalVariableNode attributes: flags = 0 @@ -309,12 +312,15 @@ ast: | frameSlot = 4 # d children: valueNode = - ArrayIndexNodesFactory$ReadConstantIndexNodeGen + ReadBlockPostArgumentFromArrayNode attributes: flags = 0 - index = -2 + hasRest = true + indexFromCount = 2 + optional = 0 + required = 4 children: - arrayNode_ = + readArrayNode = ReadLocalVariableNode attributes: flags = 0 diff --git a/src/main/java/org/truffleruby/language/arguments/ReadBlockOptionalArgumentFromArrayNode.java b/src/main/java/org/truffleruby/language/arguments/ReadBlockOptionalArgumentFromArrayNode.java new file mode 100644 index 000000000000..d1852df53733 --- /dev/null +++ b/src/main/java/org/truffleruby/language/arguments/ReadBlockOptionalArgumentFromArrayNode.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This + * code is released under a tri EPL/GPL/LGPL license. You can use it, + * redistribute it and/or modify it under the terms of the: + * + * Eclipse Public License version 2.0, or + * GNU General Public License version 2, or + * GNU Lesser General Public License version 2.1. + */ +package org.truffleruby.language.arguments; + +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.profiles.BranchProfile; +import org.truffleruby.core.array.ArrayIndexNodes; +import org.truffleruby.core.array.RubyArray; +import org.truffleruby.language.RubyContextSourceNode; +import org.truffleruby.language.RubyNode; + +public final class ReadBlockOptionalArgumentFromArrayNode extends RubyContextSourceNode { + + @Child private RubyNode readArrayNode; + @Child private RubyNode defaultValue; + @Child private ArrayIndexNodes.ReadNormalizedNode arrayReadNormalizedNode; + private final int index; + private final int minimum; + private final BranchProfile defaultValueProfile = BranchProfile.create(); + + public ReadBlockOptionalArgumentFromArrayNode( + RubyNode readArrayNode, + int index, + int minimum, + RubyNode defaultValue) { + this.readArrayNode = readArrayNode; + this.index = index; + this.minimum = minimum; + this.defaultValue = defaultValue; + } + + @Override + public Object execute(VirtualFrame frame) { + RubyArray array = (RubyArray) readArrayNode.execute(frame); + final int length = array.size; + + if (length >= minimum) { + if (arrayReadNormalizedNode == null) { + CompilerDirectives.transferToInterpreterAndInvalidate(); + arrayReadNormalizedNode = insert(ArrayIndexNodes.ReadNormalizedNode.create()); + } + + return arrayReadNormalizedNode.executeRead(array, index); + } else { + defaultValueProfile.enter(); + return defaultValue.execute(frame); + } + } + + @Override + public String toString() { + return getClass().getSimpleName() + " " + index; + } + + @Override + public RubyNode cloneUninitialized() { + var copy = new ReadBlockOptionalArgumentFromArrayNode( + readArrayNode.cloneUninitialized(), + index, + minimum, + defaultValue.cloneUninitialized()); + return copy.copyFlags(this); + } +} diff --git a/src/main/java/org/truffleruby/language/arguments/ReadBlockPostArgumentFromArrayNode.java b/src/main/java/org/truffleruby/language/arguments/ReadBlockPostArgumentFromArrayNode.java new file mode 100644 index 000000000000..a3fcece9808d --- /dev/null +++ b/src/main/java/org/truffleruby/language/arguments/ReadBlockPostArgumentFromArrayNode.java @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This + * code is released under a tri EPL/GPL/LGPL license. You can use it, + * redistribute it and/or modify it under the terms of the: + * + * Eclipse Public License version 2.0, or + * GNU General Public License version 2, or + * GNU Lesser General Public License version 2.1. + */ +package org.truffleruby.language.arguments; + +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.profiles.ConditionProfile; +import org.truffleruby.core.array.ArrayIndexNodes; +import org.truffleruby.core.array.RubyArray; +import org.truffleruby.language.RubyContextSourceNode; +import org.truffleruby.language.RubyNode; + +/** Read block's required post parameter (that is located after optional/rest parameters) from a single Array argument + * that is destructured. Based on org.truffleruby.language.arguments.ReadPostArgumentNode. */ +public final class ReadBlockPostArgumentFromArrayNode extends RubyContextSourceNode { + + @Child private RubyNode readArrayNode; + @Child private ArrayIndexNodes.ReadNormalizedNode arrayReadNormalizedNode; + /** parameter index from the end */ + private final int indexFromCount; + /** number of block required parameters (pre and post) */ + private final int required; + private final int optional; + private final boolean hasRest; + private final ConditionProfile enoughArguments = ConditionProfile.create(); + + public ReadBlockPostArgumentFromArrayNode( + RubyNode readArrayNode, + int indexFromCount, + int required, + int optional, + boolean hasRest) { + this.readArrayNode = readArrayNode; + this.indexFromCount = indexFromCount; + this.required = required; + this.optional = optional; + this.hasRest = hasRest; + } + + @Override + public Object execute(VirtualFrame frame) { + RubyArray array = (RubyArray) readArrayNode.execute(frame); + final int length = array.size; + + if (enoughArguments.profile(length >= required)) { + final int effectiveIndex; + + if (hasRest || length <= optional + required) { + effectiveIndex = length - indexFromCount; + } else { + effectiveIndex = optional + required - indexFromCount; + } + + return getReadNormalizedNode().executeRead(array, effectiveIndex); + } else { + final int effectiveIndex = required - indexFromCount; + + if (effectiveIndex < length) { + return getReadNormalizedNode().executeRead(array, effectiveIndex); + } else { + return nil; + } + } + } + + private ArrayIndexNodes.ReadNormalizedNode getReadNormalizedNode() { + if (arrayReadNormalizedNode == null) { + CompilerDirectives.transferToInterpreterAndInvalidate(); + arrayReadNormalizedNode = insert(ArrayIndexNodes.ReadNormalizedNode.create()); + } + + return arrayReadNormalizedNode; + } + + @Override + public String toString() { + return getClass().getSimpleName() + " -" + indexFromCount; + } + + @Override + public RubyNode cloneUninitialized() { + var copy = new ReadBlockPostArgumentFromArrayNode(readArrayNode.cloneUninitialized(), indexFromCount, required, + optional, hasRest); + return copy.copyFlags(this); + } +} diff --git a/src/main/java/org/truffleruby/language/arguments/ReadOptionalArgumentNode.java b/src/main/java/org/truffleruby/language/arguments/ReadOptionalArgumentNode.java index b2a66e92e01b..66a021a7445c 100644 --- a/src/main/java/org/truffleruby/language/arguments/ReadOptionalArgumentNode.java +++ b/src/main/java/org/truffleruby/language/arguments/ReadOptionalArgumentNode.java @@ -39,6 +39,8 @@ public Object execute(VirtualFrame frame) { final int positionalArgumentsCount = RubyArguments.getPositionalArgumentsCount(frame, keywordArguments); if (positionalArgumentsCount >= minimum) { + // it's enough arguments to fulfill pre and post parameters and optional parameters till the current one: + // proc { |a, b=:b, c=:c, d| [a, b, c, d] }.call(1, 2, 3) # => [1, 2, :c, 3] return RubyArguments.getArgument(frame, index); } else { defaultValueProfile.enter(); diff --git a/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java index ff42a5bb3017..e4364f797e24 100644 --- a/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java @@ -170,7 +170,6 @@ private RubyNode preludeProc( readArrayNode, environment, language, - arity, this); final RubyNode newDestructureArguments = translator.translate(); diff --git a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java index 7743443555ee..99f0ad7b7621 100644 --- a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java @@ -18,15 +18,14 @@ import org.truffleruby.RubyLanguage; import org.truffleruby.core.array.ArrayIndexNodes; import org.truffleruby.core.array.ArraySliceNodeGen; +import org.truffleruby.core.hash.HashLiteralNode; import org.truffleruby.language.RubyNode; -import org.truffleruby.language.arguments.ArrayIsAtLeastAsLargeAsNode; import org.truffleruby.language.arguments.CheckNoKeywordArgumentsNode; +import org.truffleruby.language.arguments.ReadBlockOptionalArgumentFromArrayNode; import org.truffleruby.language.arguments.ReadKeywordArgumentNode; -import org.truffleruby.language.arguments.ReadKeywordRestArgumentNode; +import org.truffleruby.language.arguments.ReadBlockPostArgumentFromArrayNode; import org.truffleruby.language.arguments.SaveMethodBlockNode; -import org.truffleruby.language.control.IfElseNodeGen; import org.truffleruby.language.locals.WriteLocalVariableNode; -import org.truffleruby.language.methods.Arity; /** Translates block's Nodes.ParametersNode to destructure a block's single Array argument. @@ -41,40 +40,45 @@ * Based on org.truffleruby.parser.YARPLoadArgumentsTranslator */ public final class YARPParametersNodeToDestructureTranslator extends AbstractNodeVisitor { + private final YARPTranslator yarpTranslator; + + private enum State { + PRE, + OPT, + POST + } + private final Nodes.ParametersNode parameters; - private final RubyNode readArrayNode; - private final TranslatorEnvironment environment; + /** position of actual argument in a frame that is being evaluated/read to match a read node and actual argument */ + private int index; + /** to distinguish pre and post Nodes.RequiredParameterNode parameters */ + private State state; + private final RubyLanguage language; - private final Arity arity; - private final YARPTranslator yarpTranslator; + private final TranslatorEnvironment environment; - private int index; // position of actual argument in a frame that is being evaluated/read - // to match a read node and actual argument + private final RubyNode readArrayNode; public YARPParametersNodeToDestructureTranslator( Nodes.ParametersNode parameters, RubyNode readArrayNode, TranslatorEnvironment environment, RubyLanguage language, - Arity arity, YARPTranslator yarpTranslator) { this.parameters = parameters; this.readArrayNode = readArrayNode; this.environment = environment; this.language = language; - this.arity = arity; this.yarpTranslator = yarpTranslator; } public RubyNode translate() { - assert parameters != null; - assert parameters.requireds.length + parameters.optionals.length + parameters.posts.length > 0; - final List sequence = new ArrayList<>(); sequence.add(Translator.loadSelf(language)); if (parameters.requireds.length > 0) { + state = State.PRE; index = 0; for (var node : parameters.requireds) { sequence.add(node.accept(this)); // Nodes.RequiredParameterNode is expected here @@ -102,6 +106,7 @@ public RubyNode translate() { } if (parameters.posts.length > 0) { + state = State.POST; index = -1; for (int i = parameters.posts.length - 1; i >= 0; i--) { @@ -110,10 +115,8 @@ public RubyNode translate() { } } - if (parameters.keywords.length != 0) { - for (var node : parameters.keywords) { - sequence.add(node.accept(this)); // Nodes.KeywordParameterNode is expected here - } + for (var node : parameters.keywords) { + sequence.add(node.accept(this)); // Nodes.OptionalKeywordParameterNode is expected here } if (parameters.keyword_rest != null) { @@ -130,7 +133,17 @@ public RubyNode translate() { @Override public RubyNode visitMultiTargetNode(Nodes.MultiTargetNode node) { - final RubyNode readNode = ArrayIndexNodes.ReadConstantIndexNode.create(readArrayNode, index); + final RubyNode readNode; + + if (state == State.PRE) { + readNode = ArrayIndexNodes.ReadConstantIndexNode.create(readArrayNode, index); + } else if (state == State.POST) { + readNode = new ReadBlockPostArgumentFromArrayNode(readArrayNode, -index, getRequiredCount(), + getOptionalCount(), hasRest()); + } else { + throw new IllegalStateException(); + } + final var translator = new YARPMultiTargetNodeTranslator(node, language, yarpTranslator, readNode); final RubyNode rubyNode = translator.translate(); return rubyNode; @@ -147,7 +160,18 @@ public RubyNode visitRequiredKeywordParameterNode(Nodes.RequiredKeywordParameter @Override public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) { - final RubyNode readNode = ArrayIndexNodes.ReadConstantIndexNode.create(readArrayNode, index); + final RubyNode readNode; + + if (state == State.PRE) { + readNode = ArrayIndexNodes.ReadConstantIndexNode.create(readArrayNode, index); + } else if (state == State.POST) { + readNode = new ReadBlockPostArgumentFromArrayNode(readArrayNode, -index, getRequiredCount(), + getOptionalCount(), hasRest()); + } else { + throw new IllegalStateException(); + } + + final int slot = environment.findFrameSlot(node.name); return new WriteLocalVariableNode(slot, readNode); } @@ -156,8 +180,10 @@ public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) { public RubyNode visitOptionalKeywordParameterNode(Nodes.OptionalKeywordParameterNode node) { final int slot = environment.declareVar(node.name); final var defaultValue = node.value.accept(this); - final var readNode = ReadKeywordArgumentNode.create(language.getSymbol(node.name), defaultValue); - return new WriteLocalVariableNode(slot, readNode); + + // keyword arguments couldn't be passed to a block in case of destructuring single Array argument, + // so assign default value directly + return new WriteLocalVariableNode(slot, defaultValue); } @Override @@ -168,17 +194,16 @@ public RubyNode visitOptionalParameterNode(Nodes.OptionalParameterNode node) { int minimum = index + 1 + parameters.posts.length; // TODO CS 10-Jan-16 we should really hoist this check, or see if Graal does it for us - readNode = IfElseNodeGen.create( - new ArrayIsAtLeastAsLargeAsNode(minimum, readArrayNode), - ArrayIndexNodes.ReadConstantIndexNode.create(readArrayNode, index), - defaultValue); + readNode = new ReadBlockOptionalArgumentFromArrayNode(readArrayNode, index, minimum, defaultValue); return new WriteLocalVariableNode(slot, readNode); } @Override public RubyNode visitRestParameterNode(Nodes.RestParameterNode node) { - // NOTE: we actually could do nothing if parameter is anonymous + // NOTE: we actually could do nothing if parameter is anonymous as far as + // the only reason to store value of anonymous rest in a local variable is + // to forward in but forwarding doesn't work in blocks final RubyNode readNode; int from = parameters.requireds.length + parameters.optionals.length; @@ -200,12 +225,13 @@ public RubyNode visitKeywordRestParameterNode(Nodes.KeywordRestParameterNode nod // NOTE: we actually could do nothing if parameter is anonymous // as far as this translator handles a block parameters only, // but anonymous keyword rest forwarding doesn't work in blocks - final RubyNode readNode = new ReadKeywordRestArgumentNode(language, arity); final String name = (node.name != null) ? node.name : TranslatorEnvironment.DEFAULT_KEYWORD_REST_NAME; final int slot = environment.declareVar(name); - // NOTE: actually we can immediately assign `{}` value - return new WriteLocalVariableNode(slot, readNode); + // keyword arguments couldn't be passed to a block in case of destructuring single Array argument, + // so immediately assign `{}` value + final var valueNode = HashLiteralNode.create(RubyNode.EMPTY_ARRAY, language); + return new WriteLocalVariableNode(slot, valueNode); } @Override @@ -230,8 +256,20 @@ public RubyNode visitBlockParameterNode(Nodes.BlockParameterNode node) { @Override protected RubyNode defaultVisit(Nodes.Node node) { - // For normal expressions in the default value for optional arguments, use the normal body translator + // translate default values of optional positional and keyword arguments return node.accept(yarpTranslator); } + private int getRequiredCount() { + return parameters.requireds.length + parameters.posts.length; + } + + private int getOptionalCount() { + return parameters.optionals.length; + } + + private boolean hasRest() { + return parameters.rest != null; + } + } From 34c54bdea64885205d0696d6dbece05cebf5bdb1 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Wed, 17 Jan 2024 13:15:58 +0100 Subject: [PATCH 042/131] Mark coverage lines in YARPTranslator --- .../org/truffleruby/parser/YARPTranslator.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 0d9bd8a9a963..44136e7f524e 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -10,6 +10,7 @@ package org.truffleruby.parser; import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.TruffleSafepoint; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeUtil; import com.oracle.truffle.api.source.Source; @@ -22,6 +23,7 @@ import org.truffleruby.annotations.Split; import org.truffleruby.builtins.PrimitiveNodeConstructor; import org.truffleruby.core.CoreLibrary; +import org.truffleruby.core.DummyNode; import org.truffleruby.core.IsNilNode; import org.truffleruby.core.array.ArrayConcatNode; import org.truffleruby.core.array.ArrayLiteralNode; @@ -3616,13 +3618,13 @@ protected SourceSection getSourceSection(Nodes.Node yarpNode) { return source.createSection(yarpNode.startOffset, yarpNode.length); } - public static RubyNode assignPositionAndFlags(Nodes.Node yarpNode, RubyNode rubyNode) { + public RubyNode assignPositionAndFlags(Nodes.Node yarpNode, RubyNode rubyNode) { assignPositionOnly(yarpNode, rubyNode); copyNewlineFlag(yarpNode, rubyNode); return rubyNode; } - public static RubyNode assignPositionAndFlagsIfMissing(Nodes.Node yarpNode, RubyNode rubyNode) { + public RubyNode assignPositionAndFlagsIfMissing(Nodes.Node yarpNode, RubyNode rubyNode) { if (rubyNode.hasSource()) { return rubyNode; } @@ -3645,8 +3647,16 @@ private void assignPositionOnly(Nodes.Node[] nodes, RubyNode rubyNode) { rubyNode.unsafeSetSourceSection(first.startOffset, length); } - private static void copyNewlineFlag(Nodes.Node yarpNode, RubyNode rubyNode) { + private void copyNewlineFlag(Nodes.Node yarpNode, RubyNode rubyNode) { if (yarpNode.hasNewLineFlag()) { + TruffleSafepoint.poll(DummyNode.INSTANCE); + + if (environment.getParseEnvironment().isCoverageEnabled()) { + rubyNode.unsafeSetIsCoverageLine(); + int startLine = environment.getParseEnvironment().yarpSource.line(yarpNode.startOffset); + language.coverageManager.setLineHasCode(source, startLine); + } + rubyNode.unsafeSetIsNewLine(); } } From c48b5474c98c93e6e921f4baf4d27accb9b3bc93 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Wed, 17 Jan 2024 13:31:25 +0100 Subject: [PATCH 043/131] Make Parser.java Java 8 compatible (required for JRuby) --- src/yarp/java/org/prism/Parser.java | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/yarp/java/org/prism/Parser.java b/src/yarp/java/org/prism/Parser.java index 3d52e8f058d8..2f7f819303f2 100644 --- a/src/yarp/java/org/prism/Parser.java +++ b/src/yarp/java/org/prism/Parser.java @@ -43,15 +43,15 @@ public byte[] serialize() { final ByteArrayOutputStream output = new ByteArrayOutputStream(); // path - output.writeBytes(serializeInt(path.length)); - output.writeBytes(path); + write(output, serializeInt(path.length)); + write(output, path); // line number - output.writeBytes(serializeInt(startLineNumber)); + write(output, serializeInt(startLineNumber)); // encoding - output.writeBytes(serializeInt(encoding.length)); - output.writeBytes(encoding); + write(output, serializeInt(encoding.length)); + write(output, encoding); // isFrozenStringLiteral if (isFrozenStringLiteral) { @@ -73,22 +73,27 @@ public byte[] serialize() { // scopes // number of scopes - output.writeBytes(serializeInt(scopes.length)); + write(output, serializeInt(scopes.length)); // local variables in each scope for (byte[][] scope : scopes) { // number of locals - output.writeBytes(serializeInt(scope.length)); + write(output, serializeInt(scope.length)); // locals for (byte[] local : scope) { - output.writeBytes(serializeInt(local.length)); - output.writeBytes(local); + write(output, serializeInt(local.length)); + write(output, local); } } return output.toByteArray(); } + private static void write(ByteArrayOutputStream output, byte[] bytes) { + // Note: we cannot use output.writeBytes(local) because that's Java 11 + output.write(bytes, 0, bytes.length); + } + private byte[] serializeInt(int n) { ByteBuffer buffer = ByteBuffer.allocate(4).order(ByteOrder.nativeOrder()); buffer.putInt(n); From 95c6b61bb83ee8e6d5b7bc809dc968387e7d5655 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Wed, 17 Jan 2024 13:25:29 +0100 Subject: [PATCH 044/131] Import ruby/prism@606810cc8af118f92f270b09e3ffe94086eb8c12 --- src/main/c/yarp/include/prism.h | 9 + src/main/c/yarp/include/prism/ast.h | 103 +++ src/main/c/yarp/include/prism/parser.h | 6 +- .../c/yarp/include/prism/util/pm_buffer.h | 9 + .../include/prism/util/pm_constant_pool.h | 7 + .../yarp/include/prism/util/pm_newline_list.h | 11 - src/main/c/yarp/src/encoding.c | 7 - src/main/c/yarp/src/prettyprint.c | 112 ++++ src/main/c/yarp/src/prism.c | 609 +++++++++++++++--- src/main/c/yarp/src/serialize.c | 8 + src/main/c/yarp/src/util/pm_buffer.c | 11 + src/main/c/yarp/src/util/pm_constant_pool.c | 23 +- src/main/c/yarp/src/util/pm_newline_list.c | 12 - src/yarp/java/org/prism/Loader.java | 16 +- src/yarp/java/org/prism/Nodes.java | 239 ++++++- 15 files changed, 1036 insertions(+), 146 deletions(-) diff --git a/src/main/c/yarp/include/prism.h b/src/main/c/yarp/include/prism.h index f4a248274fcd..45bfff7a11e1 100644 --- a/src/main/c/yarp/include/prism.h +++ b/src/main/c/yarp/include/prism.h @@ -170,6 +170,15 @@ PRISM_EXPORTED_FUNCTION bool pm_parse_success_p(const uint8_t *source, size_t si */ PRISM_EXPORTED_FUNCTION const char * pm_token_type_to_str(pm_token_type_t token_type); +/** + * Format the errors on the parser into the given buffer. + * + * @param parser The parser to format the errors for. + * @param buffer The buffer to format the errors into. + * @param colorize Whether or not to colorize the errors with ANSI escape sequences. + */ +PRISM_EXPORTED_FUNCTION void pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool colorize); + /** * @mainpage * diff --git a/src/main/c/yarp/include/prism/ast.h b/src/main/c/yarp/include/prism/ast.h index bcbcb8164565..69372a492923 100644 --- a/src/main/c/yarp/include/prism/ast.h +++ b/src/main/c/yarp/include/prism/ast.h @@ -1289,16 +1289,42 @@ typedef struct pm_assoc_node { /** * AssocNode#key + * + * The key of the association. This can be any node that represents a non-void expression. + * + * { a: b } + * ^ + * + * { foo => bar } + * ^^^ + * + * { def a; end => 1 } + * ^^^^^^^^^^ */ struct pm_node *key; /** * AssocNode#value + * + * The value of the association, if present. This can be any node that + * represents a non-void expression. It can be optionally omitted if this + * node is an element in a `HashPatternNode`. + * + * { foo => bar } + * ^^^ + * + * { x: 1 } + * ^ */ struct pm_node *value; /** * AssocNode#operator_loc + * + * The location of the `=>` operator, if present. + * + * { foo => bar } + * ^^ */ pm_location_t operator_loc; } pm_assoc_node_t; @@ -1316,11 +1342,22 @@ typedef struct pm_assoc_splat_node { /** * AssocSplatNode#value + * + * The value to be splatted, if present. Will be missing when keyword + * rest argument forwarding is used. + * + * { **foo } + * ^^^ */ struct pm_node *value; /** * AssocSplatNode#operator_loc + * + * The location of the `**` operator. + * + * { **x } + * ^^ */ pm_location_t operator_loc; } pm_assoc_splat_node_t; @@ -1410,6 +1447,8 @@ typedef struct pm_block_argument_node { * BlockLocalVariableNode * * Type: PM_BLOCK_LOCAL_VARIABLE_NODE + * Flags: + * PM_PARAMETER_FLAGS_REPEATED_PARAMETER * * @extends pm_node_t */ @@ -1469,6 +1508,8 @@ typedef struct pm_block_node { * BlockParameterNode * * Type: PM_BLOCK_PARAMETER_NODE + * Flags: + * PM_PARAMETER_FLAGS_REPEATED_PARAMETER * * @extends pm_node_t */ @@ -3043,16 +3084,34 @@ typedef struct pm_hash_node { /** * HashNode#opening_loc + * + * The location of the opening brace. + * + * { a => b } + * ^ */ pm_location_t opening_loc; /** * HashNode#elements + * + * The elements of the hash. These can be either `AssocNode`s or `AssocSplatNode`s. + * + * { a: b } + * ^^^^ + * + * { **foo } + * ^^^^^ */ struct pm_node_list elements; /** * HashNode#closing_loc + * + * The location of the closing brace. + * + * { a => b } + * ^ */ pm_location_t closing_loc; } pm_hash_node_t; @@ -3798,6 +3857,8 @@ typedef struct pm_keyword_hash_node { * KeywordRestParameterNode * * Type: PM_KEYWORD_REST_PARAMETER_NODE + * Flags: + * PM_PARAMETER_FLAGS_REPEATED_PARAMETER * * @extends pm_node_t */ @@ -4417,6 +4478,8 @@ typedef struct pm_numbered_reference_read_node { * OptionalKeywordParameterNode * * Type: PM_OPTIONAL_KEYWORD_PARAMETER_NODE + * Flags: + * PM_PARAMETER_FLAGS_REPEATED_PARAMETER * * @extends pm_node_t */ @@ -4444,6 +4507,8 @@ typedef struct pm_optional_keyword_parameter_node { * OptionalParameterNode * * Type: PM_OPTIONAL_PARAMETER_NODE + * Flags: + * PM_PARAMETER_FLAGS_REPEATED_PARAMETER * * @extends pm_node_t */ @@ -4728,16 +4793,40 @@ typedef struct pm_range_node { /** * RangeNode#left + * + * The left-hand side of the range, if present. Can be either `nil` or + * a node representing any kind of expression that returns a non-void + * value. + * + * 1... + * ^ + * + * hello...goodbye + * ^^^^^ */ struct pm_node *left; /** * RangeNode#right + * + * The right-hand side of the range, if present. Can be either `nil` or + * a node representing any kind of expression that returns a non-void + * value. + * + * ..5 + * ^ + * + * 1...foo + * ^^^ + * If neither right-hand or left-hand side was included, this will be a + * MissingNode. */ struct pm_node *right; /** * RangeNode#operator_loc + * + * The location of the `..` or `...` operator. */ pm_location_t operator_loc; } pm_range_node_t; @@ -4819,6 +4908,8 @@ typedef struct pm_regular_expression_node { * RequiredKeywordParameterNode * * Type: PM_REQUIRED_KEYWORD_PARAMETER_NODE + * Flags: + * PM_PARAMETER_FLAGS_REPEATED_PARAMETER * * @extends pm_node_t */ @@ -4841,6 +4932,8 @@ typedef struct pm_required_keyword_parameter_node { * RequiredParameterNode * * Type: PM_REQUIRED_PARAMETER_NODE + * Flags: + * PM_PARAMETER_FLAGS_REPEATED_PARAMETER * * @extends pm_node_t */ @@ -4927,6 +5020,8 @@ typedef struct pm_rescue_node { * RestParameterNode * * Type: PM_REST_PARAMETER_NODE + * Flags: + * PM_PARAMETER_FLAGS_REPEATED_PARAMETER * * @extends pm_node_t */ @@ -5542,6 +5637,14 @@ typedef enum pm_loop_flags { PM_LOOP_FLAGS_BEGIN_MODIFIER = 1, } pm_loop_flags_t; +/** + * Flags for parameter nodes. + */ +typedef enum pm_parameter_flags { + /** a parameter name that has been repeated in the method signature */ + PM_PARAMETER_FLAGS_REPEATED_PARAMETER = 1, +} pm_parameter_flags_t; + /** * Flags for range and flip-flop nodes. */ diff --git a/src/main/c/yarp/include/prism/parser.h b/src/main/c/yarp/include/prism/parser.h index 9f38dc583036..c7ebb64b60a1 100644 --- a/src/main/c/yarp/include/prism/parser.h +++ b/src/main/c/yarp/include/prism/parser.h @@ -557,7 +557,11 @@ struct pm_parser { /** The list of magic comments that have been found while parsing. */ pm_list_t magic_comment_list; - /** The optional location of the __END__ keyword and its contents. */ + /** + * An optional location that represents the location of the __END__ marker + * and the rest of the content of the file. This content is loaded into the + * DATA constant when the file being parsed is the main file being executed. + */ pm_location_t data_loc; /** The list of warnings that have been found while parsing. */ diff --git a/src/main/c/yarp/include/prism/util/pm_buffer.h b/src/main/c/yarp/include/prism/util/pm_buffer.h index ec11d05e9bd4..f0cca84af579 100644 --- a/src/main/c/yarp/include/prism/util/pm_buffer.h +++ b/src/main/c/yarp/include/prism/util/pm_buffer.h @@ -128,6 +128,15 @@ void pm_buffer_append_varuint(pm_buffer_t *buffer, uint32_t value); */ void pm_buffer_append_varsint(pm_buffer_t *buffer, int32_t value); +/** + * Prepend the given string to the buffer. + * + * @param buffer The buffer to prepend to. + * @param value The string to prepend. + * @param length The length of the string to prepend. + */ +void pm_buffer_prepend_string(pm_buffer_t *buffer, const char *value, size_t length); + /** * Concatenate one buffer onto another. * diff --git a/src/main/c/yarp/include/prism/util/pm_constant_pool.h b/src/main/c/yarp/include/prism/util/pm_constant_pool.h index ae5a88fbde3e..3743d9f58d21 100644 --- a/src/main/c/yarp/include/prism/util/pm_constant_pool.h +++ b/src/main/c/yarp/include/prism/util/pm_constant_pool.h @@ -18,6 +18,13 @@ #include #include +/** + * When we allocate constants into the pool, we reserve 0 to mean that the slot + * is not yet filled. This constant is reused in other places to indicate the + * lack of a constant id. + */ +#define PM_CONSTANT_ID_UNSET 0 + /** * A constant id is a unique identifier for a constant in the constant pool. */ diff --git a/src/main/c/yarp/include/prism/util/pm_newline_list.h b/src/main/c/yarp/include/prism/util/pm_newline_list.h index a31051f4e0a1..181283644ffc 100644 --- a/src/main/c/yarp/include/prism/util/pm_newline_list.h +++ b/src/main/c/yarp/include/prism/util/pm_newline_list.h @@ -72,17 +72,6 @@ bool pm_newline_list_init(pm_newline_list_t *list, const uint8_t *start, size_t */ bool pm_newline_list_append(pm_newline_list_t *list, const uint8_t *cursor); -/** - * Conditionally append a new offset to the newline list, if the value passed in - * is a newline. - * - * @param list The list to append to. - * @param cursor A pointer to the offset to append. - * @return True if the reallocation of the offsets succeeds (if one was - * necessary), otherwise false. - */ -bool pm_newline_list_check_append(pm_newline_list_t *list, const uint8_t *cursor); - /** * Returns the line and column of the given offset. If the offset is not in the * list, the line and column of the closest offset less than the given offset diff --git a/src/main/c/yarp/src/encoding.c b/src/main/c/yarp/src/encoding.c index 2c6d7c97772c..2210d7141128 100644 --- a/src/main/c/yarp/src/encoding.c +++ b/src/main/c/yarp/src/encoding.c @@ -5022,10 +5022,6 @@ pm_encoding_find(const uint8_t *start, const uint8_t *end) { ENCODING2("EUC-CN", "eucCN", PM_ENCODING_GB2312); ENCODING2("EUC-TW", "eucTW", PM_ENCODING_EUC_TW); ENCODING1("Emacs-Mule", PM_ENCODING_EMACS_MULE); - ENCODING1("external", PM_ENCODING_UTF_8); - break; - case 'F': case 'f': - ENCODING1("filesystem", PM_ENCODING_UTF_8); break; case 'G': case 'g': ENCODING1("GBK", PM_ENCODING_GBK); @@ -5071,9 +5067,6 @@ pm_encoding_find(const uint8_t *start, const uint8_t *end) { ENCODING1("KOI8-R", PM_ENCODING_KOI8_R); ENCODING1("KOI8-U", PM_ENCODING_KOI8_U); break; - case 'L': case 'l': - ENCODING1("locale", PM_ENCODING_UTF_8); - break; case 'M': case 'm': ENCODING1("macCentEuro", PM_ENCODING_MAC_CENT_EURO); ENCODING1("macCroatian", PM_ENCODING_MAC_CROATIAN); diff --git a/src/main/c/yarp/src/prettyprint.c b/src/main/c/yarp/src/prettyprint.c index 48796b81655e..7b4ae67db502 100644 --- a/src/main/c/yarp/src/prettyprint.c +++ b/src/main/c/yarp/src/prettyprint.c @@ -754,6 +754,20 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm prettyprint_location(output_buffer, parser, &node->location); pm_buffer_append_string(output_buffer, ")\n", 2); + // flags + { + pm_buffer_concat(output_buffer, prefix_buffer); + pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 flags:", 16); + bool found = false; + if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) { + if (found) pm_buffer_append_byte(output_buffer, ','); + pm_buffer_append_string(output_buffer, " repeated_parameter", 19); + found = true; + } + if (!found) pm_buffer_append_string(output_buffer, " \xe2\x88\x85", 4); + pm_buffer_append_byte(output_buffer, '\n'); + } + // name { pm_buffer_concat(output_buffer, prefix_buffer); @@ -856,6 +870,20 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm prettyprint_location(output_buffer, parser, &node->location); pm_buffer_append_string(output_buffer, ")\n", 2); + // flags + { + pm_buffer_concat(output_buffer, prefix_buffer); + pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 flags:", 16); + bool found = false; + if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) { + if (found) pm_buffer_append_byte(output_buffer, ','); + pm_buffer_append_string(output_buffer, " repeated_parameter", 19); + found = true; + } + if (!found) pm_buffer_append_string(output_buffer, " \xe2\x88\x85", 4); + pm_buffer_append_byte(output_buffer, '\n'); + } + // name { pm_buffer_concat(output_buffer, prefix_buffer); @@ -5576,6 +5604,20 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm prettyprint_location(output_buffer, parser, &node->location); pm_buffer_append_string(output_buffer, ")\n", 2); + // flags + { + pm_buffer_concat(output_buffer, prefix_buffer); + pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 flags:", 16); + bool found = false; + if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) { + if (found) pm_buffer_append_byte(output_buffer, ','); + pm_buffer_append_string(output_buffer, " repeated_parameter", 19); + found = true; + } + if (!found) pm_buffer_append_string(output_buffer, " \xe2\x88\x85", 4); + pm_buffer_append_byte(output_buffer, '\n'); + } + // name { pm_buffer_concat(output_buffer, prefix_buffer); @@ -6713,6 +6755,20 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm prettyprint_location(output_buffer, parser, &node->location); pm_buffer_append_string(output_buffer, ")\n", 2); + // flags + { + pm_buffer_concat(output_buffer, prefix_buffer); + pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 flags:", 16); + bool found = false; + if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) { + if (found) pm_buffer_append_byte(output_buffer, ','); + pm_buffer_append_string(output_buffer, " repeated_parameter", 19); + found = true; + } + if (!found) pm_buffer_append_string(output_buffer, " \xe2\x88\x85", 4); + pm_buffer_append_byte(output_buffer, '\n'); + } + // name { pm_buffer_concat(output_buffer, prefix_buffer); @@ -6755,6 +6811,20 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm prettyprint_location(output_buffer, parser, &node->location); pm_buffer_append_string(output_buffer, ")\n", 2); + // flags + { + pm_buffer_concat(output_buffer, prefix_buffer); + pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 flags:", 16); + bool found = false; + if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) { + if (found) pm_buffer_append_byte(output_buffer, ','); + pm_buffer_append_string(output_buffer, " repeated_parameter", 19); + found = true; + } + if (!found) pm_buffer_append_string(output_buffer, " \xe2\x88\x85", 4); + pm_buffer_append_byte(output_buffer, '\n'); + } + // name { pm_buffer_concat(output_buffer, prefix_buffer); @@ -7521,6 +7591,20 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm prettyprint_location(output_buffer, parser, &node->location); pm_buffer_append_string(output_buffer, ")\n", 2); + // flags + { + pm_buffer_concat(output_buffer, prefix_buffer); + pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 flags:", 16); + bool found = false; + if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) { + if (found) pm_buffer_append_byte(output_buffer, ','); + pm_buffer_append_string(output_buffer, " repeated_parameter", 19); + found = true; + } + if (!found) pm_buffer_append_string(output_buffer, " \xe2\x88\x85", 4); + pm_buffer_append_byte(output_buffer, '\n'); + } + // name { pm_buffer_concat(output_buffer, prefix_buffer); @@ -7550,6 +7634,20 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm prettyprint_location(output_buffer, parser, &node->location); pm_buffer_append_string(output_buffer, ")\n", 2); + // flags + { + pm_buffer_concat(output_buffer, prefix_buffer); + pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 flags:", 16); + bool found = false; + if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) { + if (found) pm_buffer_append_byte(output_buffer, ','); + pm_buffer_append_string(output_buffer, " repeated_parameter", 19); + found = true; + } + if (!found) pm_buffer_append_string(output_buffer, " \xe2\x88\x85", 4); + pm_buffer_append_byte(output_buffer, '\n'); + } + // name { pm_buffer_concat(output_buffer, prefix_buffer); @@ -7725,6 +7823,20 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm prettyprint_location(output_buffer, parser, &node->location); pm_buffer_append_string(output_buffer, ")\n", 2); + // flags + { + pm_buffer_concat(output_buffer, prefix_buffer); + pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 flags:", 16); + bool found = false; + if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) { + if (found) pm_buffer_append_byte(output_buffer, ','); + pm_buffer_append_string(output_buffer, " repeated_parameter", 19); + found = true; + } + if (!found) pm_buffer_append_string(output_buffer, " \xe2\x88\x85", 4); + pm_buffer_append_byte(output_buffer, '\n'); + } + // name { pm_buffer_concat(output_buffer, prefix_buffer); diff --git a/src/main/c/yarp/src/prism.c b/src/main/c/yarp/src/prism.c index 5cefb1a86aa7..bbeb3cffe969 100644 --- a/src/main/c/yarp/src/prism.c +++ b/src/main/c/yarp/src/prism.c @@ -887,6 +887,22 @@ pm_node_flag_unset(pm_node_t *node, pm_node_flags_t flag) { node->flags &= (pm_node_flags_t) ~flag; } +/** + * Set the repeated parameter flag on the given node. + */ +static inline void +pm_node_flag_set_repeated_parameter(pm_node_t *node) { + assert(PM_NODE_TYPE(node) == PM_BLOCK_LOCAL_VARIABLE_NODE || + PM_NODE_TYPE(node) == PM_BLOCK_PARAMETER_NODE || + PM_NODE_TYPE(node) == PM_KEYWORD_REST_PARAMETER_NODE || + PM_NODE_TYPE(node) == PM_OPTIONAL_KEYWORD_PARAMETER_NODE || + PM_NODE_TYPE(node) == PM_OPTIONAL_PARAMETER_NODE || + PM_NODE_TYPE(node) == PM_REQUIRED_KEYWORD_PARAMETER_NODE || + PM_NODE_TYPE(node) == PM_REQUIRED_PARAMETER_NODE || + PM_NODE_TYPE(node) == PM_REST_PARAMETER_NODE); + + pm_node_flag_set(node, PM_PARAMETER_FLAGS_REPEATED_PARAMETER); +} /******************************************************************************/ /* Node creation functions */ @@ -5916,6 +5932,33 @@ pm_parser_scope_push(pm_parser_t *parser, bool closed) { return true; } +/** + * Save the current param name as the return value and set it to the given + * constant id. + */ +static inline pm_constant_id_t +pm_parser_current_param_name_set(pm_parser_t *parser, pm_constant_id_t current_param_name) { + pm_constant_id_t saved_param_name = parser->current_param_name; + parser->current_param_name = current_param_name; + return saved_param_name; +} + +/** + * Save the current param name as the return value and clear it. + */ +static inline pm_constant_id_t +pm_parser_current_param_name_unset(pm_parser_t *parser) { + return pm_parser_current_param_name_set(parser, PM_CONSTANT_ID_UNSET); +} + +/** + * Restore the current param name from the given value. + */ +static inline void +pm_parser_current_param_name_restore(pm_parser_t *parser, pm_constant_id_t saved_param_name) { + parser->current_param_name = saved_param_name; +} + /** * Check if any of the currently visible scopes contain a local variable * described by the given constant id. @@ -5995,23 +6038,28 @@ pm_parser_local_add_owned(pm_parser_t *parser, const uint8_t *start, size_t leng /** * Add a parameter name to the current scope and check whether the name of the * parameter is unique or not. + * + * Returns `true` if this is a duplicate parameter name, otherwise returns + * false. */ -static void +static bool pm_parser_parameter_name_check(pm_parser_t *parser, const pm_token_t *name) { // We want to check whether the parameter name is a numbered parameter or // not. pm_refute_numbered_parameter(parser, name->start, name->end); - // We want to ignore any parameter name that starts with an underscore. - if ((name->start < name->end) && (*name->start == '_')) return; - // Otherwise we'll fetch the constant id for the parameter name and check // whether it's already in the current scope. pm_constant_id_t constant_id = pm_parser_constant_id_token(parser, name); if (pm_constant_id_list_includes(&parser->current_scope->locals, constant_id)) { - pm_parser_err_token(parser, name, PM_ERR_PARAMETER_NAME_REPEAT); + // Add an error if the parameter doesn't start with _ and has been seen before + if ((name->start < name->end) && (*name->start != '_')) { + pm_parser_err_token(parser, name, PM_ERR_PARAMETER_NAME_REPEAT); + } + return true; } + return false; } /** @@ -6340,8 +6388,10 @@ parser_lex_magic_comment_encoding(pm_parser_t *parser) { */ static void parser_lex_magic_comment_frozen_string_literal_value(pm_parser_t *parser, const uint8_t *start, const uint8_t *end) { - if (start + 4 <= end && pm_strncasecmp(start, (const uint8_t *) "true", 4) == 0) { + if ((start + 4 <= end) && pm_strncasecmp(start, (const uint8_t *) "true", 4) == 0) { parser->frozen_string_literal = true; + } else if ((start + 5 <= end) && pm_strncasecmp(start, (const uint8_t *) "false", 5) == 0) { + parser->frozen_string_literal = false; } } @@ -8093,6 +8143,34 @@ pm_heredoc_strspn_inline_whitespace(pm_parser_t *parser, const uint8_t **cursor, return whitespace; } +/** + * Lex past the delimiter of a percent literal. Handle newlines and heredocs + * appropriately. + */ +static uint8_t +pm_lex_percent_delimiter(pm_parser_t *parser) { + size_t eol_length = match_eol(parser); + + if (eol_length) { + if (parser->heredoc_end) { + // If we have already lexed a heredoc, then the newline has already + // been added to the list. In this case we want to just flush the + // heredoc end. + parser_flush_heredoc_end(parser); + } else { + // Otherwise, we'll add the newline to the list of newlines. + pm_newline_list_append(&parser->newline_list, parser->current.end + eol_length - 1); + } + + const uint8_t delimiter = *parser->current.end; + parser->current.end += eol_length; + + return delimiter; + } + + return *parser->current.end++; +} + /** * This is a convenience macro that will set the current token type, call the * lex callback, and then return from the parser_lex function. @@ -8894,11 +8972,12 @@ parser_lex(pm_parser_t *parser) { } bool spcarg = lex_state_spcarg_p(parser, space_seen); - if (spcarg) { + bool is_beg = lex_state_beg_p(parser); + if (!is_beg && spcarg) { pm_parser_warn_token(parser, &parser->current, PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_MINUS); } - if (lex_state_beg_p(parser) || spcarg) { + if (is_beg || spcarg) { lex_state_set(parser, PM_LEX_STATE_BEG); LEX(pm_char_is_decimal_digit(peek(parser)) ? PM_TOKEN_UMINUS_NUM : PM_TOKEN_UMINUS); } @@ -9049,15 +9128,8 @@ parser_lex(pm_parser_t *parser) { pm_parser_err_current(parser, PM_ERR_INVALID_PERCENT); } - lex_mode_push_string(parser, true, false, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end)); - - size_t eol_length = match_eol(parser); - if (eol_length) { - parser->current.end += eol_length; - pm_newline_list_append(&parser->newline_list, parser->current.end - 1); - } else { - parser->current.end++; - } + const uint8_t delimiter = pm_lex_percent_delimiter(parser); + lex_mode_push_string(parser, true, false, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter)); if (parser->current.end < parser->end) { LEX(PM_TOKEN_STRING_BEGIN); @@ -9077,7 +9149,7 @@ parser_lex(pm_parser_t *parser) { parser->current.end++; if (parser->current.end < parser->end) { - lex_mode_push_list(parser, false, *parser->current.end++); + lex_mode_push_list(parser, false, pm_lex_percent_delimiter(parser)); } else { lex_mode_push_list_eof(parser); } @@ -9088,7 +9160,7 @@ parser_lex(pm_parser_t *parser) { parser->current.end++; if (parser->current.end < parser->end) { - lex_mode_push_list(parser, true, *parser->current.end++); + lex_mode_push_list(parser, true, pm_lex_percent_delimiter(parser)); } else { lex_mode_push_list_eof(parser); } @@ -9099,9 +9171,8 @@ parser_lex(pm_parser_t *parser) { parser->current.end++; if (parser->current.end < parser->end) { - lex_mode_push_regexp(parser, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end)); - pm_newline_list_check_append(&parser->newline_list, parser->current.end); - parser->current.end++; + const uint8_t delimiter = pm_lex_percent_delimiter(parser); + lex_mode_push_regexp(parser, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter)); } else { lex_mode_push_regexp(parser, '\0', '\0'); } @@ -9112,9 +9183,8 @@ parser_lex(pm_parser_t *parser) { parser->current.end++; if (parser->current.end < parser->end) { - lex_mode_push_string(parser, false, false, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end)); - pm_newline_list_check_append(&parser->newline_list, parser->current.end); - parser->current.end++; + const uint8_t delimiter = pm_lex_percent_delimiter(parser); + lex_mode_push_string(parser, false, false, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter)); } else { lex_mode_push_string_eof(parser); } @@ -9125,9 +9195,8 @@ parser_lex(pm_parser_t *parser) { parser->current.end++; if (parser->current.end < parser->end) { - lex_mode_push_string(parser, true, false, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end)); - pm_newline_list_check_append(&parser->newline_list, parser->current.end); - parser->current.end++; + const uint8_t delimiter = pm_lex_percent_delimiter(parser); + lex_mode_push_string(parser, true, false, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter)); } else { lex_mode_push_string_eof(parser); } @@ -9138,9 +9207,9 @@ parser_lex(pm_parser_t *parser) { parser->current.end++; if (parser->current.end < parser->end) { - lex_mode_push_string(parser, false, false, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end)); + const uint8_t delimiter = pm_lex_percent_delimiter(parser); + lex_mode_push_string(parser, false, false, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter)); lex_state_set(parser, PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM); - parser->current.end++; } else { lex_mode_push_string_eof(parser); } @@ -9151,7 +9220,7 @@ parser_lex(pm_parser_t *parser) { parser->current.end++; if (parser->current.end < parser->end) { - lex_mode_push_list(parser, false, *parser->current.end++); + lex_mode_push_list(parser, false, pm_lex_percent_delimiter(parser)); } else { lex_mode_push_list_eof(parser); } @@ -9162,7 +9231,7 @@ parser_lex(pm_parser_t *parser) { parser->current.end++; if (parser->current.end < parser->end) { - lex_mode_push_list(parser, true, *parser->current.end++); + lex_mode_push_list(parser, true, pm_lex_percent_delimiter(parser)); } else { lex_mode_push_list_eof(parser); } @@ -9173,8 +9242,8 @@ parser_lex(pm_parser_t *parser) { parser->current.end++; if (parser->current.end < parser->end) { - lex_mode_push_string(parser, true, false, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end)); - parser->current.end++; + const uint8_t delimiter = pm_lex_percent_delimiter(parser); + lex_mode_push_string(parser, true, false, lex_mode_incrementor(delimiter), lex_mode_terminator(delimiter)); } else { lex_mode_push_string_eof(parser); } @@ -11448,7 +11517,9 @@ parse_required_destructured_parameter(pm_parser_t *parser) { if (accept1(parser, PM_TOKEN_IDENTIFIER)) { pm_token_t name = parser->previous; value = (pm_node_t *) pm_required_parameter_node_create(parser, &name); - pm_parser_parameter_name_check(parser, &name); + if (pm_parser_parameter_name_check(parser, &name)) { + pm_node_flag_set_repeated_parameter(value); + } pm_parser_local_add_token(parser, &name); } @@ -11458,7 +11529,9 @@ parse_required_destructured_parameter(pm_parser_t *parser) { pm_token_t name = parser->previous; param = (pm_node_t *) pm_required_parameter_node_create(parser, &name); - pm_parser_parameter_name_check(parser, &name); + if (pm_parser_parameter_name_check(parser, &name)) { + pm_node_flag_set_repeated_parameter(param); + } pm_parser_local_add_token(parser, &name); } @@ -11575,9 +11648,10 @@ parse_parameters( pm_token_t operator = parser->previous; pm_token_t name; + bool repeated = false; if (accept1(parser, PM_TOKEN_IDENTIFIER)) { name = parser->previous; - pm_parser_parameter_name_check(parser, &name); + repeated = pm_parser_parameter_name_check(parser, &name); pm_parser_local_add_token(parser, &name); } else { name = not_provided(parser); @@ -11588,6 +11662,9 @@ parse_parameters( } pm_block_parameter_node_t *param = pm_block_parameter_node_create(parser, &name, &operator); + if (repeated) { + pm_node_flag_set_repeated_parameter((pm_node_t *)param); + } if (params->block == NULL) { pm_parameters_node_block_set(params, param); } else { @@ -11660,20 +11737,23 @@ parse_parameters( } pm_token_t name = parser->previous; - pm_parser_parameter_name_check(parser, &name); + bool repeated = pm_parser_parameter_name_check(parser, &name); pm_parser_local_add_token(parser, &name); if (accept1(parser, PM_TOKEN_EQUAL)) { pm_token_t operator = parser->previous; context_push(parser, PM_CONTEXT_DEFAULT_PARAMS); - pm_constant_id_t old_param_name = parser->current_param_name; - parser->current_param_name = pm_parser_constant_id_token(parser, &name); + + pm_constant_id_t saved_param_name = pm_parser_current_param_name_set(parser, pm_parser_constant_id_token(parser, &name)); pm_node_t *value = parse_value_expression(parser, binding_power, false, PM_ERR_PARAMETER_NO_DEFAULT); pm_optional_parameter_node_t *param = pm_optional_parameter_node_create(parser, &name, &operator, value); + if (repeated) { + pm_node_flag_set_repeated_parameter((pm_node_t *)param); + } pm_parameters_node_optionals_append(params, param); - parser->current_param_name = old_param_name; + pm_parser_current_param_name_restore(parser, saved_param_name); context_pop(parser); // If parsing the value of the parameter resulted in error recovery, @@ -11685,9 +11765,15 @@ parse_parameters( } } else if (order > PM_PARAMETERS_ORDER_AFTER_OPTIONAL) { pm_required_parameter_node_t *param = pm_required_parameter_node_create(parser, &name); + if (repeated) { + pm_node_flag_set_repeated_parameter((pm_node_t *)param); + } pm_parameters_node_requireds_append(params, (pm_node_t *) param); } else { pm_required_parameter_node_t *param = pm_required_parameter_node_create(parser, &name); + if (repeated) { + pm_node_flag_set_repeated_parameter((pm_node_t *)param); + } pm_parameters_node_posts_append(params, (pm_node_t *) param); } @@ -11702,7 +11788,7 @@ parse_parameters( pm_token_t local = name; local.end -= 1; - pm_parser_parameter_name_check(parser, &local); + bool repeated = pm_parser_parameter_name_check(parser, &local); pm_parser_local_add_token(parser, &local); switch (parser->current.type) { @@ -11710,6 +11796,9 @@ parse_parameters( case PM_TOKEN_PARENTHESIS_RIGHT: case PM_TOKEN_PIPE: { pm_node_t *param = (pm_node_t *) pm_required_keyword_parameter_node_create(parser, &name); + if (repeated) { + pm_node_flag_set_repeated_parameter(param); + } pm_parameters_node_keywords_append(params, param); break; } @@ -11721,6 +11810,9 @@ parse_parameters( } pm_node_t *param = (pm_node_t *) pm_required_keyword_parameter_node_create(parser, &name); + if (repeated) { + pm_node_flag_set_repeated_parameter(param); + } pm_parameters_node_keywords_append(params, param); break; } @@ -11729,17 +11821,22 @@ parse_parameters( if (token_begins_expression_p(parser->current.type)) { context_push(parser, PM_CONTEXT_DEFAULT_PARAMS); - pm_constant_id_t old_param_name = parser->current_param_name; - parser->current_param_name = pm_parser_constant_id_token(parser, &local); + + pm_constant_id_t saved_param_name = pm_parser_current_param_name_set(parser, pm_parser_constant_id_token(parser, &local)); pm_node_t *value = parse_value_expression(parser, binding_power, false, PM_ERR_PARAMETER_NO_DEFAULT_KW); - parser->current_param_name = old_param_name; + + pm_parser_current_param_name_restore(parser, saved_param_name); context_pop(parser); + param = (pm_node_t *) pm_optional_keyword_parameter_node_create(parser, &name, value); } else { param = (pm_node_t *) pm_required_keyword_parameter_node_create(parser, &name); } + if (repeated) { + pm_node_flag_set_repeated_parameter(param); + } pm_parameters_node_keywords_append(params, param); // If parsing the value of the parameter resulted in error recovery, @@ -11762,10 +11859,10 @@ parse_parameters( pm_token_t operator = parser->previous; pm_token_t name; - + bool repeated = false; if (accept1(parser, PM_TOKEN_IDENTIFIER)) { name = parser->previous; - pm_parser_parameter_name_check(parser, &name); + repeated = pm_parser_parameter_name_check(parser, &name); pm_parser_local_add_token(parser, &name); } else { name = not_provided(parser); @@ -11776,6 +11873,9 @@ parse_parameters( } pm_node_t *param = (pm_node_t *) pm_rest_parameter_node_create(parser, &operator, &name); + if (repeated) { + pm_node_flag_set_repeated_parameter(param); + } if (params->rest == NULL) { pm_parameters_node_rest_set(params, param); } else { @@ -11798,9 +11898,10 @@ parse_parameters( } else { pm_token_t name; + bool repeated = false; if (accept1(parser, PM_TOKEN_IDENTIFIER)) { name = parser->previous; - pm_parser_parameter_name_check(parser, &name); + repeated = pm_parser_parameter_name_check(parser, &name); pm_parser_local_add_token(parser, &name); } else { name = not_provided(parser); @@ -11811,6 +11912,9 @@ parse_parameters( } param = (pm_node_t *) pm_keyword_rest_parameter_node_create(parser, &operator, &name); + if (repeated) { + pm_node_flag_set_repeated_parameter(param); + } } if (params->keyword_rest == NULL) { @@ -12046,10 +12150,13 @@ parse_block_parameters( if ((opening->type != PM_TOKEN_NOT_PROVIDED) && accept1(parser, PM_TOKEN_SEMICOLON)) { do { expect1(parser, PM_TOKEN_IDENTIFIER, PM_ERR_BLOCK_PARAM_LOCAL_VARIABLE); - pm_parser_parameter_name_check(parser, &parser->previous); + bool repeated = pm_parser_parameter_name_check(parser, &parser->previous); pm_parser_local_add_token(parser, &parser->previous); pm_block_local_variable_node_t *local = pm_block_local_variable_node_create(parser, &parser->previous); + if (repeated) { + pm_node_flag_set_repeated_parameter((pm_node_t *)local); + } pm_block_parameters_node_append_local(block_parameters, local); } while (accept1(parser, PM_TOKEN_COMMA)); } @@ -12065,8 +12172,10 @@ parse_block(pm_parser_t *parser) { pm_token_t opening = parser->previous; accept1(parser, PM_TOKEN_NEWLINE); + pm_constant_id_t saved_param_name = pm_parser_current_param_name_unset(parser); pm_accepts_block_stack_push(parser, true); pm_parser_scope_push(parser, false); + pm_block_parameters_node_t *block_parameters = NULL; if (accept1(parser, PM_TOKEN_PIPE)) { @@ -12130,6 +12239,8 @@ parse_block(pm_parser_t *parser) { pm_constant_id_list_t locals = parser->current_scope->locals; pm_parser_scope_pop(parser); pm_accepts_block_stack_pop(parser); + pm_parser_current_param_name_restore(parser, saved_param_name); + return pm_block_node_create(parser, &locals, locals_body_index, &opening, parameters, statements, &parser->previous); } @@ -12551,14 +12662,48 @@ parse_string_part(pm_parser_t *parser) { } } +/** + * When creating a symbol, unary operators that cannot be binary operators + * automatically drop trailing `@` characters. This happens at the parser level, + * such that `~@` is parsed as `~` and `!@` is parsed as `!`. We do that here. + */ +static pm_node_t * +parse_operator_symbol(pm_parser_t *parser, const pm_token_t *opening, pm_lex_state_t next_state) { + pm_token_t closing = not_provided(parser); + pm_symbol_node_t *symbol = pm_symbol_node_create(parser, opening, &parser->current, &closing); + + const uint8_t *end = parser->current.end; + switch (parser->current.type) { + case PM_TOKEN_TILDE: + case PM_TOKEN_BANG: + if (parser->current.end[-1] == '@') end--; + break; + default: + break; + } + + if (next_state != PM_LEX_STATE_NONE) lex_state_set(parser, next_state); + parser_lex(parser); + + pm_string_shared_init(&symbol->unescaped, parser->previous.start, end); + return (pm_node_t *) symbol; +} + +/** + * Parse a symbol node. This function will get called immediately after finding + * a symbol opening token. This handles parsing bare symbols and interpolated + * symbols. + */ static pm_node_t * parse_symbol(pm_parser_t *parser, pm_lex_mode_t *lex_mode, pm_lex_state_t next_state) { - pm_token_t opening = parser->previous; + const pm_token_t opening = parser->previous; if (lex_mode->mode != PM_LEX_STRING) { if (next_state != PM_LEX_STATE_NONE) lex_state_set(parser, next_state); switch (parser->current.type) { + case PM_CASE_OPERATOR: + return parse_operator_symbol(parser, &opening, next_state == PM_LEX_STATE_NONE ? PM_LEX_STATE_ENDFN : next_state); case PM_TOKEN_IDENTIFIER: case PM_TOKEN_CONSTANT: case PM_TOKEN_INSTANCE_VARIABLE: @@ -12570,10 +12715,6 @@ parse_symbol(pm_parser_t *parser, pm_lex_mode_t *lex_mode, pm_lex_state_t next_s case PM_CASE_KEYWORD: parser_lex(parser); break; - case PM_CASE_OPERATOR: - lex_state_set(parser, next_state == PM_LEX_STATE_NONE ? PM_LEX_STATE_ENDFN : next_state); - parser_lex(parser); - break; default: expect2(parser, PM_TOKEN_IDENTIFIER, PM_TOKEN_METHOD_NAME, PM_ERR_SYMBOL_INVALID); break; @@ -12689,8 +12830,11 @@ parse_symbol(pm_parser_t *parser, pm_lex_mode_t *lex_mode, pm_lex_state_t next_s static inline pm_node_t * parse_undef_argument(pm_parser_t *parser) { switch (parser->current.type) { + case PM_CASE_OPERATOR: { + const pm_token_t opening = not_provided(parser); + return parse_operator_symbol(parser, &opening, PM_LEX_STATE_NONE); + } case PM_CASE_KEYWORD: - case PM_CASE_OPERATOR: case PM_TOKEN_CONSTANT: case PM_TOKEN_IDENTIFIER: case PM_TOKEN_METHOD_NAME: { @@ -12724,16 +12868,17 @@ parse_undef_argument(pm_parser_t *parser) { static inline pm_node_t * parse_alias_argument(pm_parser_t *parser, bool first) { switch (parser->current.type) { - case PM_CASE_OPERATOR: + case PM_CASE_OPERATOR: { + const pm_token_t opening = not_provided(parser); + return parse_operator_symbol(parser, &opening, first ? PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM : PM_LEX_STATE_NONE); + } case PM_CASE_KEYWORD: case PM_TOKEN_CONSTANT: case PM_TOKEN_IDENTIFIER: case PM_TOKEN_METHOD_NAME: { - if (first) { - lex_state_set(parser, PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM); - } - + if (first) lex_state_set(parser, PM_LEX_STATE_FNAME | PM_LEX_STATE_FITEM); parser_lex(parser); + pm_token_t opening = not_provided(parser); pm_token_t closing = not_provided(parser); pm_symbol_node_t *symbol = pm_symbol_node_create(parser, &opening, &parser->previous, &closing); @@ -14799,8 +14944,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b pm_token_t operator = parser->previous; pm_node_t *expression = parse_value_expression(parser, PM_BINDING_POWER_NOT, true, PM_ERR_EXPECT_EXPRESSION_AFTER_LESS_LESS); - pm_constant_id_t old_param_name = parser->current_param_name; - parser->current_param_name = 0; + pm_constant_id_t saved_param_name = pm_parser_current_param_name_unset(parser); pm_parser_scope_push(parser, true); accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON); @@ -14817,11 +14961,12 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b } expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_CLASS_TERM); - pm_constant_id_list_t locals = parser->current_scope->locals; + pm_parser_scope_pop(parser); - parser->current_param_name = old_param_name; pm_do_loop_stack_pop(parser); + pm_parser_current_param_name_restore(parser, saved_param_name); + return (pm_node_t *) pm_singleton_class_node_create(parser, &locals, &class_keyword, &operator, expression, statements, &parser->previous); } @@ -14847,9 +14992,9 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b superclass = NULL; } - pm_constant_id_t old_param_name = parser->current_param_name; - parser->current_param_name = 0; + pm_constant_id_t saved_param_name = pm_parser_current_param_name_unset(parser); pm_parser_scope_push(parser, true); + if (inheritance_operator.type != PM_TOKEN_NOT_PROVIDED) { expect2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON, PM_ERR_CLASS_UNEXPECTED_END); } else { @@ -14875,9 +15020,10 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b } pm_constant_id_list_t locals = parser->current_scope->locals; + pm_parser_scope_pop(parser); - parser->current_param_name = old_param_name; pm_do_loop_stack_pop(parser); + pm_parser_current_param_name_restore(parser, saved_param_name); if (!PM_NODE_TYPE_P(constant_path, PM_CONSTANT_PATH_NODE) && !(PM_NODE_TYPE_P(constant_path, PM_CONSTANT_READ_NODE))) { pm_parser_err_node(parser, constant_path, PM_ERR_CLASS_NAME); @@ -14892,18 +15038,21 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b pm_token_t operator = not_provided(parser); pm_token_t name = (pm_token_t) { .type = PM_TOKEN_MISSING, .start = def_keyword.end, .end = def_keyword.end }; - // This context is necessary for lexing `...` in a bare params correctly. - // It must be pushed before lexing the first param, so it is here. + // This context is necessary for lexing `...` in a bare params + // correctly. It must be pushed before lexing the first param, so it + // is here. context_push(parser, PM_CONTEXT_DEF_PARAMS); + pm_constant_id_t saved_param_name; + parser_lex(parser); - pm_constant_id_t old_param_name = parser->current_param_name; switch (parser->current.type) { case PM_CASE_OPERATOR: + saved_param_name = pm_parser_current_param_name_unset(parser); pm_parser_scope_push(parser, true); - parser->current_param_name = 0; lex_state_set(parser, PM_LEX_STATE_ENDFN); parser_lex(parser); + name = parser->previous; break; case PM_TOKEN_IDENTIFIER: { @@ -14912,17 +15061,18 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b if (match2(parser, PM_TOKEN_DOT, PM_TOKEN_COLON_COLON)) { receiver = parse_variable_call(parser); + saved_param_name = pm_parser_current_param_name_unset(parser); pm_parser_scope_push(parser, true); - parser->current_param_name = 0; lex_state_set(parser, PM_LEX_STATE_FNAME); parser_lex(parser); operator = parser->previous; name = parse_method_definition_name(parser); } else { + saved_param_name = pm_parser_current_param_name_unset(parser); pm_refute_numbered_parameter(parser, parser->previous.start, parser->previous.end); pm_parser_scope_push(parser, true); - parser->current_param_name = 0; + name = parser->previous; } @@ -14939,9 +15089,10 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b case PM_TOKEN_KEYWORD___FILE__: case PM_TOKEN_KEYWORD___LINE__: case PM_TOKEN_KEYWORD___ENCODING__: { + saved_param_name = pm_parser_current_param_name_unset(parser); pm_parser_scope_push(parser, true); - parser->current_param_name = 0; parser_lex(parser); + pm_token_t identifier = parser->previous; if (match2(parser, PM_TOKEN_DOT, PM_TOKEN_COLON_COLON)) { @@ -15003,6 +15154,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b pm_token_t lparen = parser->previous; pm_node_t *expression = parse_value_expression(parser, PM_BINDING_POWER_STATEMENT, true, PM_ERR_DEF_RECEIVER); + accept1(parser, PM_TOKEN_NEWLINE); expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_EXPECT_RPAREN); pm_token_t rparen = parser->previous; @@ -15012,8 +15164,8 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b operator = parser->previous; receiver = (pm_node_t *) pm_parentheses_node_create(parser, &lparen, expression, &rparen); + saved_param_name = pm_parser_current_param_name_unset(parser); pm_parser_scope_push(parser, true); - parser->current_param_name = 0; // To push `PM_CONTEXT_DEF_PARAMS` again is for the same reason as described the above. context_push(parser, PM_CONTEXT_DEF_PARAMS); @@ -15021,8 +15173,9 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b break; } default: + saved_param_name = pm_parser_current_param_name_unset(parser); pm_parser_scope_push(parser, true); - parser->current_param_name = 0; + name = parse_method_definition_name(parser); break; } @@ -15137,8 +15290,9 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b } pm_constant_id_list_t locals = parser->current_scope->locals; - parser->current_param_name = old_param_name; + pm_parser_scope_pop(parser); + pm_parser_current_param_name_restore(parser, saved_param_name); return (pm_node_t *) pm_def_node_create( parser, @@ -15366,9 +15520,9 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b pm_parser_err_token(parser, &name, PM_ERR_MODULE_NAME); } - pm_constant_id_t old_param_name = parser->current_param_name; - parser->current_param_name = 0; + pm_constant_id_t saved_param_name = pm_parser_current_param_name_unset(parser); pm_parser_scope_push(parser, true); + accept2(parser, PM_TOKEN_SEMICOLON, PM_TOKEN_NEWLINE); pm_node_t *statements = NULL; @@ -15385,7 +15539,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b pm_constant_id_list_t locals = parser->current_scope->locals; pm_parser_scope_pop(parser); - parser->current_param_name = old_param_name; + pm_parser_current_param_name_restore(parser, saved_param_name); expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_MODULE_TERM); @@ -16052,7 +16206,9 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b parser_lex(parser); pm_token_t operator = parser->previous; + pm_constant_id_t saved_param_name = pm_parser_current_param_name_unset(parser); pm_parser_scope_push(parser, false); + pm_block_parameters_node_t *block_parameters; switch (parser->current.type) { @@ -16131,8 +16287,11 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b } pm_constant_id_list_t locals = parser->current_scope->locals; + pm_parser_scope_pop(parser); pm_accepts_block_stack_pop(parser); + pm_parser_current_param_name_restore(parser, saved_param_name); + return (pm_node_t *) pm_lambda_node_create(parser, &locals, locals_body_index, &operator, &opening, &parser->previous, parameters, body); } case PM_TOKEN_UPLUS: { @@ -17549,3 +17708,293 @@ pm_serialize_parse_comments(pm_buffer_t *buffer, const uint8_t *source, size_t s #undef PM_LOCATION_NODE_VALUE #undef PM_LOCATION_NULL_VALUE #undef PM_LOCATION_TOKEN_VALUE + +/** An error that is going to be formatted into the output. */ +typedef struct { + /** A pointer to the diagnostic that was generated during parsing. */ + pm_diagnostic_t *error; + + /** The start line of the diagnostic message. */ + size_t line; + + /** The column start of the diagnostic message. */ + size_t column_start; + + /** The column end of the diagnostic message. */ + size_t column_end; +} pm_error_t; + +/** The format that will be used to format the errors into the output. */ +typedef struct { + /** The prefix that will be used for line numbers. */ + const char *number_prefix; + + /** The prefix that will be used for blank lines. */ + const char *blank_prefix; + + /** The divider that will be used between sections of source code. */ + const char *divider; + + /** The length of the blank prefix. */ + size_t blank_prefix_length; + + /** The length of the divider. */ + size_t divider_length; +} pm_error_format_t; + +#define PM_COLOR_GRAY "\033[38;5;102m" +#define PM_COLOR_RED "\033[1;31m" +#define PM_COLOR_RESET "\033[0m" + +static inline pm_error_t * +pm_parser_errors_format_sort(const pm_list_t *error_list, const pm_newline_list_t *newline_list) { + pm_error_t *errors = calloc(error_list->size, sizeof(pm_error_t)); + + for (pm_diagnostic_t *error = (pm_diagnostic_t *) error_list->head; error != NULL; error = (pm_diagnostic_t *) error->node.next) { + pm_line_column_t start = pm_newline_list_line_column(newline_list, error->location.start); + pm_line_column_t end = pm_newline_list_line_column(newline_list, error->location.end); + + // We're going to insert this error into the array in sorted order. We + // do this by finding the first error that has a line number greater + // than the current error and then inserting the current error before + // that one. + size_t index = 0; + while ( + (index < error_list->size) && + (errors[index].error != NULL) && + ( + (errors[index].line < start.line) || + (errors[index].line == start.line && errors[index].column_start < start.column) + ) + ) index++; + + // Now we're going to shift all of the errors after this one down one + // index to make room for the new error. + memcpy(&errors[index + 1], &errors[index], sizeof(pm_error_t) * (error_list->size - index - 1)); + + // Finally, we'll insert the error into the array. + size_t column_end; + if (start.line == end.line) { + column_end = end.column; + } else { + column_end = newline_list->offsets[start.line + 1] - newline_list->offsets[start.line] - 1; + } + + // Ensure we have at least one column of error. + if (start.column == column_end) column_end++; + + errors[index] = (pm_error_t) { + .error = error, + .line = start.line, + .column_start = start.column, + .column_end = column_end + }; + } + + return errors; +} + +static inline void +pm_parser_errors_format_line(const pm_parser_t *parser, const pm_newline_list_t *newline_list, const char *number_prefix, size_t line, pm_buffer_t *buffer) { + const uint8_t *start = &parser->start[newline_list->offsets[line]]; + const uint8_t *end; + + if (line + 1 > newline_list->size) { + end = parser->end; + } else { + end = &parser->start[newline_list->offsets[line + 1]]; + } + + pm_buffer_append_format(buffer, number_prefix, line + 1); + pm_buffer_append_string(buffer, (const char *) start, (size_t) (end - start)); +} + +/** + * Format the errors on the parser into the given buffer. + */ +PRISM_EXPORTED_FUNCTION void +pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool colorize) { + const pm_list_t *error_list = &parser->error_list; + assert(error_list->size != 0); + + // First, we're going to sort all of the errors by line number using an + // insertion sort into a newly allocated array. + const pm_newline_list_t *newline_list = &parser->newline_list; + pm_error_t *errors = pm_parser_errors_format_sort(error_list, newline_list); + + // Now we're going to determine how we're going to format line numbers and + // blank lines based on the maximum number of digits in the line numbers + // that are going to be displayed. + pm_error_format_t error_format; + size_t max_line_number = errors[error_list->size - 1].line + 1; + + if (max_line_number < 10) { + if (colorize) { + error_format = (pm_error_format_t) { + .number_prefix = PM_COLOR_GRAY "%1zu | " PM_COLOR_RESET, + .blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET, + .divider = PM_COLOR_GRAY " ~~~~~" PM_COLOR_RESET "\n" + }; + } else { + error_format = (pm_error_format_t) { + .number_prefix = "%1zu | ", + .blank_prefix = " | ", + .divider = " ~~~~~\n" + }; + } + } else if (max_line_number < 100) { + if (colorize) { + error_format = (pm_error_format_t) { + .number_prefix = PM_COLOR_GRAY "%2zu | " PM_COLOR_RESET, + .blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET, + .divider = PM_COLOR_GRAY " ~~~~~~" PM_COLOR_RESET "\n" + }; + } else { + error_format = (pm_error_format_t) { + .number_prefix = "%2zu | ", + .blank_prefix = " | ", + .divider = " ~~~~~~\n" + }; + } + } else if (max_line_number < 1000) { + if (colorize) { + error_format = (pm_error_format_t) { + .number_prefix = PM_COLOR_GRAY "%3zu | " PM_COLOR_RESET, + .blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET, + .divider = PM_COLOR_GRAY " ~~~~~~~" PM_COLOR_RESET "\n" + }; + } else { + error_format = (pm_error_format_t) { + .number_prefix = "%3zu | ", + .blank_prefix = " | ", + .divider = " ~~~~~~~\n" + }; + } + } else if (max_line_number < 10000) { + if (colorize) { + error_format = (pm_error_format_t) { + .number_prefix = PM_COLOR_GRAY "%4zu | " PM_COLOR_RESET, + .blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET, + .divider = PM_COLOR_GRAY " ~~~~~~~~" PM_COLOR_RESET "\n" + }; + } else { + error_format = (pm_error_format_t) { + .number_prefix = "%4zu | ", + .blank_prefix = " | ", + .divider = " ~~~~~~~~\n" + }; + } + } else { + if (colorize) { + error_format = (pm_error_format_t) { + .number_prefix = PM_COLOR_GRAY "%5zu | " PM_COLOR_RESET, + .blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET, + .divider = PM_COLOR_GRAY " ~~~~~~~~" PM_COLOR_RESET "\n" + }; + } else { + error_format = (pm_error_format_t) { + .number_prefix = "%5zu | ", + .blank_prefix = " | ", + .divider = " ~~~~~~~~\n" + }; + } + } + + error_format.blank_prefix_length = strlen(error_format.blank_prefix); + error_format.divider_length = strlen(error_format.divider); + + // Now we're going to iterate through every error in our error list and + // display it. While we're iterating, we will display some padding lines of + // the source before the error to give some context. We'll be careful not to + // display the same line twice in case the errors are close enough in the + // source. + size_t last_line = (size_t) -1; + const pm_encoding_t *encoding = parser->encoding; + + for (size_t index = 0; index < error_list->size; index++) { + pm_error_t *error = &errors[index]; + + // Here we determine how many lines of padding of the source to display, + // based on the difference from the last line that was displayed. + if (error->line - last_line > 1) { + if (error->line - last_line > 2) { + if ((index != 0) && (error->line - last_line > 3)) { + pm_buffer_append_string(buffer, error_format.divider, error_format.divider_length); + } + + pm_buffer_append_string(buffer, " ", 2); + pm_parser_errors_format_line(parser, newline_list, error_format.number_prefix, error->line - 2, buffer); + } + + pm_buffer_append_string(buffer, " ", 2); + pm_parser_errors_format_line(parser, newline_list, error_format.number_prefix, error->line - 1, buffer); + } + + // If this is the first error or we're on a new line, then we'll display + // the line that has the error in it. + if ((index == 0) || (error->line != last_line)) { + if (colorize) { + pm_buffer_append_string(buffer, PM_COLOR_RED "> " PM_COLOR_RESET, 13); + } else { + pm_buffer_append_string(buffer, "> ", 2); + } + pm_parser_errors_format_line(parser, newline_list, error_format.number_prefix, error->line, buffer); + } + + // Now we'll display the actual error message. We'll do this by first + // putting the prefix to the line, then a bunch of blank spaces + // depending on the column, then as many carets as we need to display + // the width of the error, then the error message itself. + // + // Note that this doesn't take into account the width of the actual + // character when displayed in the terminal. For some east-asian + // languages or emoji, this means it can be thrown off pretty badly. We + // will need to solve this eventually. + pm_buffer_append_string(buffer, " ", 2); + pm_buffer_append_string(buffer, error_format.blank_prefix, error_format.blank_prefix_length); + + size_t column = 0; + const uint8_t *start = &parser->start[newline_list->offsets[error->line]]; + + while (column < error->column_end) { + if (column < error->column_start) { + pm_buffer_append_byte(buffer, ' '); + } else if (colorize) { + pm_buffer_append_string(buffer, PM_COLOR_RED "^" PM_COLOR_RESET, 12); + } else { + pm_buffer_append_byte(buffer, '^'); + } + + size_t char_width = encoding->char_width(start + column, parser->end - (start + column)); + column += (char_width == 0 ? 1 : char_width); + } + + pm_buffer_append_byte(buffer, ' '); + + const char *message = error->error->message; + pm_buffer_append_string(buffer, message, strlen(message)); + pm_buffer_append_byte(buffer, '\n'); + + // Here we determine how many lines of padding to display after the + // error, depending on where the next error is in source. + last_line = error->line; + size_t next_line = (index == error_list->size - 1) ? newline_list->size - 1 : errors[index + 1].line; + + if (next_line - last_line > 1) { + pm_buffer_append_string(buffer, " ", 2); + pm_parser_errors_format_line(parser, newline_list, error_format.number_prefix, ++last_line, buffer); + } + + if (next_line - last_line > 1) { + pm_buffer_append_string(buffer, " ", 2); + pm_parser_errors_format_line(parser, newline_list, error_format.number_prefix, ++last_line, buffer); + } + } + + // Finally, we'll free the array of errors that we allocated. + free(errors); +} + +#undef PM_COLOR_GRAY +#undef PM_COLOR_RED +#undef PM_COLOR_RESET diff --git a/src/main/c/yarp/src/serialize.c b/src/main/c/yarp/src/serialize.c index 06f99e3b753a..3582cbfaca38 100644 --- a/src/main/c/yarp/src/serialize.c +++ b/src/main/c/yarp/src/serialize.c @@ -181,6 +181,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) { break; } case PM_BLOCK_LOCAL_VARIABLE_NODE: { + pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK)); pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_block_local_variable_node_t *)node)->name)); break; } @@ -204,6 +205,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) { break; } case PM_BLOCK_PARAMETER_NODE: { + pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK)); pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_block_parameter_node_t *)node)->name)); break; } @@ -822,6 +824,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) { break; } case PM_KEYWORD_REST_PARAMETER_NODE: { + pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK)); pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_keyword_rest_parameter_node_t *)node)->name)); break; } @@ -981,11 +984,13 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) { break; } case PM_OPTIONAL_KEYWORD_PARAMETER_NODE: { + pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK)); pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_optional_keyword_parameter_node_t *)node)->name)); pm_serialize_node(parser, (pm_node_t *)((pm_optional_keyword_parameter_node_t *)node)->value, buffer); break; } case PM_OPTIONAL_PARAMETER_NODE: { + pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK)); pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_optional_parameter_node_t *)node)->name)); pm_serialize_node(parser, (pm_node_t *)((pm_optional_parameter_node_t *)node)->value, buffer); break; @@ -1101,10 +1106,12 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) { break; } case PM_REQUIRED_KEYWORD_PARAMETER_NODE: { + pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK)); pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_required_keyword_parameter_node_t *)node)->name)); break; } case PM_REQUIRED_PARAMETER_NODE: { + pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK)); pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_required_parameter_node_t *)node)->name)); break; } @@ -1137,6 +1144,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) { break; } case PM_REST_PARAMETER_NODE: { + pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK)); pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_rest_parameter_node_t *)node)->name)); break; } diff --git a/src/main/c/yarp/src/util/pm_buffer.c b/src/main/c/yarp/src/util/pm_buffer.c index 307b55d030b9..0ae944542881 100644 --- a/src/main/c/yarp/src/util/pm_buffer.c +++ b/src/main/c/yarp/src/util/pm_buffer.c @@ -160,6 +160,17 @@ pm_buffer_append_varsint(pm_buffer_t *buffer, int32_t value) { pm_buffer_append_varuint(buffer, unsigned_int); } +/** + * Prepend the given string to the buffer. + */ +void +pm_buffer_prepend_string(pm_buffer_t *buffer, const char *value, size_t length) { + size_t cursor = buffer->length; + pm_buffer_append_length(buffer, length); + memmove(buffer->value + length, buffer->value, cursor); + memcpy(buffer->value, value, length); +} + /** * Concatenate one buffer onto another. */ diff --git a/src/main/c/yarp/src/util/pm_constant_pool.c b/src/main/c/yarp/src/util/pm_constant_pool.c index e06682eb4831..7b8ed0654dce 100644 --- a/src/main/c/yarp/src/util/pm_constant_pool.c +++ b/src/main/c/yarp/src/util/pm_constant_pool.c @@ -124,13 +124,13 @@ pm_constant_pool_resize(pm_constant_pool_t *pool) { // If an id is set on this constant, then we know we have content here. // In this case we need to insert it into the next constant pool. - if (bucket->id != 0) { + if (bucket->id != PM_CONSTANT_ID_UNSET) { uint32_t next_index = bucket->hash & mask; // This implements linear scanning to find the next available slot // in case this index is already taken. We don't need to bother // comparing the values since we know that the hash is unique. - while (next_buckets[next_index].id != 0) { + while (next_buckets[next_index].id != PM_CONSTANT_ID_UNSET) { next_index = (next_index + 1) & mask; } @@ -177,7 +177,7 @@ pm_constant_pool_init(pm_constant_pool_t *pool, uint32_t capacity) { */ pm_constant_t * pm_constant_pool_id_to_constant(const pm_constant_pool_t *pool, pm_constant_id_t constant_id) { - assert(constant_id > 0 && constant_id <= pool->size); + assert(constant_id != PM_CONSTANT_ID_UNSET && constant_id <= pool->size); return &pool->constants[constant_id - 1]; } @@ -187,7 +187,7 @@ pm_constant_pool_id_to_constant(const pm_constant_pool_t *pool, pm_constant_id_t static inline pm_constant_id_t pm_constant_pool_insert(pm_constant_pool_t *pool, const uint8_t *start, size_t length, pm_constant_pool_bucket_type_t type) { if (pool->size >= (pool->capacity / 4 * 3)) { - if (!pm_constant_pool_resize(pool)) return 0; + if (!pm_constant_pool_resize(pool)) return PM_CONSTANT_ID_UNSET; } assert(is_power_of_two(pool->capacity)); @@ -197,7 +197,7 @@ pm_constant_pool_insert(pm_constant_pool_t *pool, const uint8_t *start, size_t l uint32_t index = hash & mask; pm_constant_pool_bucket_t *bucket; - while (bucket = &pool->buckets[index], bucket->id != 0) { + while (bucket = &pool->buckets[index], bucket->id != PM_CONSTANT_ID_UNSET) { // If there is a collision, then we need to check if the content is the // same as the content we are trying to insert. If it is, then we can // return the id of the existing constant. @@ -248,8 +248,8 @@ pm_constant_pool_insert(pm_constant_pool_t *pool, const uint8_t *start, size_t l } /** - * Insert a constant into a constant pool. Returns the id of the constant, or 0 - * if any potential calls to resize fail. + * Insert a constant into a constant pool. Returns the id of the constant, or + * PM_CONSTANT_ID_UNSET if any potential calls to resize fail. */ pm_constant_id_t pm_constant_pool_insert_shared(pm_constant_pool_t *pool, const uint8_t *start, size_t length) { @@ -258,8 +258,8 @@ pm_constant_pool_insert_shared(pm_constant_pool_t *pool, const uint8_t *start, s /** * Insert a constant into a constant pool from memory that is now owned by the - * constant pool. Returns the id of the constant, or 0 if any potential calls to - * resize fail. + * constant pool. Returns the id of the constant, or PM_CONSTANT_ID_UNSET if any + * potential calls to resize fail. */ pm_constant_id_t pm_constant_pool_insert_owned(pm_constant_pool_t *pool, const uint8_t *start, size_t length) { @@ -268,7 +268,8 @@ pm_constant_pool_insert_owned(pm_constant_pool_t *pool, const uint8_t *start, si /** * Insert a constant into a constant pool from memory that is constant. Returns - * the id of the constant, or 0 if any potential calls to resize fail. + * the id of the constant, or PM_CONSTANT_ID_UNSET if any potential calls to + * resize fail. */ pm_constant_id_t pm_constant_pool_insert_constant(pm_constant_pool_t *pool, const uint8_t *start, size_t length) { @@ -286,7 +287,7 @@ pm_constant_pool_free(pm_constant_pool_t *pool) { pm_constant_pool_bucket_t *bucket = &pool->buckets[index]; // If an id is set on this constant, then we know we have content here. - if (bucket->id != 0 && bucket->type == PM_CONSTANT_POOL_BUCKET_OWNED) { + if (bucket->id != PM_CONSTANT_ID_UNSET && bucket->type == PM_CONSTANT_POOL_BUCKET_OWNED) { pm_constant_t *constant = &pool->constants[bucket->id - 1]; free((void *) constant->start); } diff --git a/src/main/c/yarp/src/util/pm_newline_list.c b/src/main/c/yarp/src/util/pm_newline_list.c index f27bb75b63a4..32a4a050fe6c 100644 --- a/src/main/c/yarp/src/util/pm_newline_list.c +++ b/src/main/c/yarp/src/util/pm_newline_list.c @@ -45,18 +45,6 @@ pm_newline_list_append(pm_newline_list_t *list, const uint8_t *cursor) { return true; } -/** - * Conditionally append a new offset to the newline list, if the value passed in - * is a newline. - */ -bool -pm_newline_list_check_append(pm_newline_list_t *list, const uint8_t *cursor) { - if (*cursor != '\n') { - return true; - } - return pm_newline_list_append(list, cursor); -} - /** * Returns the line and column of the given offset. If the offset is not in the * list, the line and column of the closest offset less than the given offset diff --git a/src/yarp/java/org/prism/Loader.java b/src/yarp/java/org/prism/Loader.java index f79f180e4369..ce4614834570 100644 --- a/src/yarp/java/org/prism/Loader.java +++ b/src/yarp/java/org/prism/Loader.java @@ -325,11 +325,11 @@ private Nodes.Node loadNode() { case 12: return new Nodes.BlockArgumentNode(loadOptionalNode(), startOffset, length); case 13: - return new Nodes.BlockLocalVariableNode(loadConstant(), startOffset, length); + return new Nodes.BlockLocalVariableNode(loadFlags(), loadConstant(), startOffset, length); case 14: return new Nodes.BlockNode(loadConstants(), loadVarUInt(), loadOptionalNode(), loadOptionalNode(), startOffset, length); case 15: - return new Nodes.BlockParameterNode(loadOptionalConstant(), startOffset, length); + return new Nodes.BlockParameterNode(loadFlags(), loadOptionalConstant(), startOffset, length); case 16: return new Nodes.BlockParametersNode((Nodes.ParametersNode) loadOptionalNode(), loadNodes(), startOffset, length); case 17: @@ -477,7 +477,7 @@ private Nodes.Node loadNode() { case 88: return new Nodes.KeywordHashNode(loadFlags(), loadNodes(), startOffset, length); case 89: - return new Nodes.KeywordRestParameterNode(loadOptionalConstant(), startOffset, length); + return new Nodes.KeywordRestParameterNode(loadFlags(), loadOptionalConstant(), startOffset, length); case 90: return new Nodes.LambdaNode(loadConstants(), loadVarUInt(), loadOptionalNode(), loadOptionalNode(), startOffset, length); case 91: @@ -519,9 +519,9 @@ private Nodes.Node loadNode() { case 109: return new Nodes.NumberedReferenceReadNode(loadVarUInt(), startOffset, length); case 110: - return new Nodes.OptionalKeywordParameterNode(loadConstant(), loadNode(), startOffset, length); + return new Nodes.OptionalKeywordParameterNode(loadFlags(), loadConstant(), loadNode(), startOffset, length); case 111: - return new Nodes.OptionalParameterNode(loadConstant(), loadNode(), startOffset, length); + return new Nodes.OptionalParameterNode(loadFlags(), loadConstant(), loadNode(), startOffset, length); case 112: return new Nodes.OrNode(loadNode(), loadNode(), startOffset, length); case 113: @@ -547,15 +547,15 @@ private Nodes.Node loadNode() { case 123: return new Nodes.RegularExpressionNode(loadFlags(), loadString(), startOffset, length); case 124: - return new Nodes.RequiredKeywordParameterNode(loadConstant(), startOffset, length); + return new Nodes.RequiredKeywordParameterNode(loadFlags(), loadConstant(), startOffset, length); case 125: - return new Nodes.RequiredParameterNode(loadConstant(), startOffset, length); + return new Nodes.RequiredParameterNode(loadFlags(), loadConstant(), startOffset, length); case 126: return new Nodes.RescueModifierNode(loadNode(), loadNode(), startOffset, length); case 127: return new Nodes.RescueNode(loadNodes(), loadOptionalNode(), (Nodes.StatementsNode) loadOptionalNode(), (Nodes.RescueNode) loadOptionalNode(), startOffset, length); case 128: - return new Nodes.RestParameterNode(loadOptionalConstant(), startOffset, length); + return new Nodes.RestParameterNode(loadFlags(), loadOptionalConstant(), startOffset, length); case 129: return new Nodes.RetryNode(startOffset, length); case 130: diff --git a/src/yarp/java/org/prism/Nodes.java b/src/yarp/java/org/prism/Nodes.java index b658aa8750b9..c7ebd674e51c 100644 --- a/src/yarp/java/org/prism/Nodes.java +++ b/src/yarp/java/org/prism/Nodes.java @@ -532,6 +532,49 @@ public boolean isBeginModifier() { } + /** + * Flags for parameter nodes. + */ + public static final class ParameterFlags implements Comparable { + + // a parameter name that has been repeated in the method signature + public static final short REPEATED_PARAMETER = 1 << 0; + + public static boolean isRepeatedParameter(short flags) { + return (flags & REPEATED_PARAMETER) != 0; + } + + private final short flags; + + public ParameterFlags(short flags) { + this.flags = flags; + } + + @Override + public int hashCode() { + return flags; + } + + @Override + public boolean equals(Object other) { + if (!(other instanceof ParameterFlags)) { + return false; + } + + return flags == ((ParameterFlags) other).flags; + } + + @Override + public int compareTo(ParameterFlags other) { + return flags - other.flags; + } + + public boolean isRepeatedParameter() { + return (flags & REPEATED_PARAMETER) != 0; + } + + } + /** * Flags for range and flip-flop nodes. */ @@ -1268,7 +1311,34 @@ protected String toString(String indent) { * ^^^^^^ */ public static final class AssocNode extends Node { + /** + * 
+         * The key of the association. This can be any node that represents a non-void expression.
+         *
+         *     { a: b }
+         *       ^
+         *
+         *     { foo => bar }
+         *       ^^^
+         *
+         *     { def a; end => 1 }
+         *       ^^^^^^^^^^
+         *
+ */ public final Node key; + /** + * 
+         * The value of the association, if present. This can be any node that
+         * represents a non-void expression. It can be optionally omitted if this
+         * node is an element in a `HashPatternNode`.
+         *
+         *     { foo => bar }
+         *              ^^^
+         *
+         *     { x: 1 }
+         *          ^
+         *
+ */ @Nullable public final Node value; @@ -1319,6 +1389,15 @@ protected String toString(String indent) { * ^^^^^ */ public static final class AssocSplatNode extends Node { + /** + * 
+         * The value to be splatted, if present. Will be missing when keyword
+         * rest argument forwarding is used.
+         *
+         *     { **foo }
+         *         ^^^
+         *
+ */ @Nullable public final Node value; @@ -1530,13 +1609,19 @@ protected String toString(String indent) { * ^ */ public static final class BlockLocalVariableNode extends Node { + public final short flags; public final String name; - public BlockLocalVariableNode(String name, int startOffset, int length) { + public BlockLocalVariableNode(short flags, String name, int startOffset, int length) { super(startOffset, length); + this.flags = flags; this.name = name; } - + + public boolean isRepeatedParameter() { + return ParameterFlags.isRepeatedParameter(this.flags); + } + public void visitChildNodes(AbstractNodeVisitor visitor) { } @@ -1558,6 +1643,10 @@ protected String toString(String indent) { builder.append('\n'); String nextIndent = indent + " "; builder.append(nextIndent); + builder.append("flags: "); + builder.append(this.flags); + builder.append('\n'); + builder.append(nextIndent); builder.append("name: "); builder.append('"').append(this.name).append('"'); builder.append('\n'); @@ -1642,14 +1731,20 @@ protected String toString(String indent) { * end */ public static final class BlockParameterNode extends Node { + public final short flags; @Nullable public final String name; - public BlockParameterNode(String name, int startOffset, int length) { + public BlockParameterNode(short flags, String name, int startOffset, int length) { super(startOffset, length); + this.flags = flags; this.name = name; } - + + public boolean isRepeatedParameter() { + return ParameterFlags.isRepeatedParameter(this.flags); + } + public void visitChildNodes(AbstractNodeVisitor visitor) { } @@ -1671,6 +1766,10 @@ protected String toString(String indent) { builder.append('\n'); String nextIndent = indent + " "; builder.append(nextIndent); + builder.append("flags: "); + builder.append(this.flags); + builder.append('\n'); + builder.append(nextIndent); builder.append("name: "); builder.append(this.name == null ? "null" : "\"" + this.name + "\""); builder.append('\n'); @@ -4377,6 +4476,17 @@ protected String toString(String indent) { * ^^^^^^^^^^ */ public static final class HashNode extends Node { + /** + * 
+         * The elements of the hash. These can be either `AssocNode`s or `AssocSplatNode`s.
+         *
+         *     { a: b }
+         *       ^^^^
+         *
+         *     { **foo }
+         *       ^^^^^
+         *
+ */ public final Node[] elements; public HashNode(Node[] elements, int startOffset, int length) { @@ -5916,14 +6026,20 @@ protected String toString(String indent) { * end */ public static final class KeywordRestParameterNode extends Node { + public final short flags; @Nullable public final String name; - public KeywordRestParameterNode(String name, int startOffset, int length) { + public KeywordRestParameterNode(short flags, String name, int startOffset, int length) { super(startOffset, length); + this.flags = flags; this.name = name; } - + + public boolean isRepeatedParameter() { + return ParameterFlags.isRepeatedParameter(this.flags); + } + public void visitChildNodes(AbstractNodeVisitor visitor) { } @@ -5945,6 +6061,10 @@ protected String toString(String indent) { builder.append('\n'); String nextIndent = indent + " "; builder.append(nextIndent); + builder.append("flags: "); + builder.append(this.flags); + builder.append('\n'); + builder.append(nextIndent); builder.append("name: "); builder.append(this.name == null ? "null" : "\"" + this.name + "\""); builder.append('\n'); @@ -7051,15 +7171,21 @@ protected String toString(String indent) { * end */ public static final class OptionalKeywordParameterNode extends Node { + public final short flags; public final String name; public final Node value; - public OptionalKeywordParameterNode(String name, Node value, int startOffset, int length) { + public OptionalKeywordParameterNode(short flags, String name, Node value, int startOffset, int length) { super(startOffset, length); + this.flags = flags; this.name = name; this.value = value; } - + + public boolean isRepeatedParameter() { + return ParameterFlags.isRepeatedParameter(this.flags); + } + public void visitChildNodes(AbstractNodeVisitor visitor) { this.value.accept(visitor); } @@ -7082,6 +7208,10 @@ protected String toString(String indent) { builder.append('\n'); String nextIndent = indent + " "; builder.append(nextIndent); + builder.append("flags: "); + builder.append(this.flags); + builder.append('\n'); + builder.append(nextIndent); builder.append("name: "); builder.append('"').append(this.name).append('"'); builder.append('\n'); @@ -7100,15 +7230,21 @@ protected String toString(String indent) { * end */ public static final class OptionalParameterNode extends Node { + public final short flags; public final String name; public final Node value; - public OptionalParameterNode(String name, Node value, int startOffset, int length) { + public OptionalParameterNode(short flags, String name, Node value, int startOffset, int length) { super(startOffset, length); + this.flags = flags; this.name = name; this.value = value; } - + + public boolean isRepeatedParameter() { + return ParameterFlags.isRepeatedParameter(this.flags); + } + public void visitChildNodes(AbstractNodeVisitor visitor) { this.value.accept(visitor); } @@ -7131,6 +7267,10 @@ protected String toString(String indent) { builder.append('\n'); String nextIndent = indent + " "; builder.append(nextIndent); + builder.append("flags: "); + builder.append(this.flags); + builder.append('\n'); + builder.append(nextIndent); builder.append("name: "); builder.append('"').append(this.name).append('"'); builder.append('\n'); @@ -7590,9 +7730,46 @@ protected String toString(String indent) { * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */ public static final class RangeNode extends Node { + /** + * 
+         * A flag indicating whether the range excludes the end value.
+         *
+         *     1..3  # includes 3
+         *
+         *     1...3 # excludes 3
+         *
+ */ public final short flags; + /** + * 
+         * The left-hand side of the range, if present. Can be either `nil` or
+         * a node representing any kind of expression that returns a non-void
+         * value.
+         *
+         *     1...
+         *     ^
+         *
+         *     hello...goodbye
+         *     ^^^^^
+         *
+ */ @Nullable public final Node left; + /** + * 
+         * The right-hand side of the range, if present. Can be either `nil` or
+         * a node representing any kind of expression that returns a non-void
+         * value.
+         *
+         *     ..5
+         *       ^
+         *
+         *     1...foo
+         *         ^^^
+         * If neither right-hand or left-hand side was included, this will be a
+         * MissingNode.
+         *
+ */ @Nullable public final Node right; @@ -7825,13 +8002,19 @@ protected String toString(String indent) { * end */ public static final class RequiredKeywordParameterNode extends Node { + public final short flags; public final String name; - public RequiredKeywordParameterNode(String name, int startOffset, int length) { + public RequiredKeywordParameterNode(short flags, String name, int startOffset, int length) { super(startOffset, length); + this.flags = flags; this.name = name; } - + + public boolean isRepeatedParameter() { + return ParameterFlags.isRepeatedParameter(this.flags); + } + public void visitChildNodes(AbstractNodeVisitor visitor) { } @@ -7853,6 +8036,10 @@ protected String toString(String indent) { builder.append('\n'); String nextIndent = indent + " "; builder.append(nextIndent); + builder.append("flags: "); + builder.append(this.flags); + builder.append('\n'); + builder.append(nextIndent); builder.append("name: "); builder.append('"').append(this.name).append('"'); builder.append('\n'); @@ -7868,13 +8055,19 @@ protected String toString(String indent) { * end */ public static final class RequiredParameterNode extends Node { + public final short flags; public final String name; - public RequiredParameterNode(String name, int startOffset, int length) { + public RequiredParameterNode(short flags, String name, int startOffset, int length) { super(startOffset, length); + this.flags = flags; this.name = name; } - + + public boolean isRepeatedParameter() { + return ParameterFlags.isRepeatedParameter(this.flags); + } + public void visitChildNodes(AbstractNodeVisitor visitor) { } @@ -7896,6 +8089,10 @@ protected String toString(String indent) { builder.append('\n'); String nextIndent = indent + " "; builder.append(nextIndent); + builder.append("flags: "); + builder.append(this.flags); + builder.append('\n'); + builder.append(nextIndent); builder.append("name: "); builder.append('"').append(this.name).append('"'); builder.append('\n'); @@ -8050,14 +8247,20 @@ protected String toString(String indent) { * end */ public static final class RestParameterNode extends Node { + public final short flags; @Nullable public final String name; - public RestParameterNode(String name, int startOffset, int length) { + public RestParameterNode(short flags, String name, int startOffset, int length) { super(startOffset, length); + this.flags = flags; this.name = name; } - + + public boolean isRepeatedParameter() { + return ParameterFlags.isRepeatedParameter(this.flags); + } + public void visitChildNodes(AbstractNodeVisitor visitor) { } @@ -8079,6 +8282,10 @@ protected String toString(String indent) { builder.append('\n'); String nextIndent = indent + " "; builder.append(nextIndent); + builder.append("flags: "); + builder.append(this.flags); + builder.append('\n'); + builder.append(nextIndent); builder.append("name: "); builder.append(this.name == null ? "null" : "\"" + this.name + "\""); builder.append('\n'); From 35c006bdb41a5e69143a2705e9de9eee7f3e378d Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Wed, 17 Jan 2024 13:37:02 +0100 Subject: [PATCH 045/131] Adopt latest Prism changes --- .../parser/YARPLoadArgumentsTranslator.java | 16 ++++++++++------ .../org/truffleruby/parser/YARPTranslator.java | 6 +++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java index 0ea36018b36d..a655574bc8f9 100644 --- a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java @@ -32,6 +32,8 @@ public final class YARPLoadArgumentsTranslator extends AbstractNodeVisitor { + private static final short NO_FLAGS = YARPTranslator.NO_FLAGS; + private final Arity arity; private final boolean isProc; // block or lambda/method private final boolean isMethod; // method or proc @@ -44,9 +46,10 @@ private enum State { } private final Nodes.ParametersNode parameters; - private int index; // position of actual argument in a frame that is being evaluated/read - // to match a read node and actual argument - private State state; // to distinguish pre and post Nodes.RequiredParameterNode parameters + /** position of actual argument in a frame that is being evaluated/read to match a read node and actual argument */ + private int index; + /** to distinguish pre and post Nodes.RequiredParameterNode parameters */ + private State state; private final RubyLanguage language; private final TranslatorEnvironment environment; @@ -301,9 +304,10 @@ public RubyNode visitForwardingParameterNode(Nodes.ForwardingParameterNode node) ArrayList sequence = new ArrayList<>(); // desugar ... to *, **, and & parameters - final var rest = new Nodes.RestParameterNode(TranslatorEnvironment.FORWARDED_REST_NAME, 0, 0); - final var keyrest = new Nodes.KeywordRestParameterNode(TranslatorEnvironment.FORWARDED_KEYWORD_REST_NAME, 0, 0); - final var block = new Nodes.BlockParameterNode(TranslatorEnvironment.FORWARDED_BLOCK_NAME, 0, 0); + final var rest = new Nodes.RestParameterNode(NO_FLAGS, TranslatorEnvironment.FORWARDED_REST_NAME, 0, 0); + final var keyrest = new Nodes.KeywordRestParameterNode(NO_FLAGS, + TranslatorEnvironment.FORWARDED_KEYWORD_REST_NAME, 0, 0); + final var block = new Nodes.BlockParameterNode(NO_FLAGS, TranslatorEnvironment.FORWARDED_BLOCK_NAME, 0, 0); sequence.add(rest.accept(this)); sequence.add(keyrest.accept(this)); diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 44136e7f524e..fafa6102895b 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -198,7 +198,7 @@ public class YARPTranslator extends AbstractNodeVisitor { public static final RescueNode[] EMPTY_RESCUE_NODE_ARRAY = new RescueNode[0]; - protected static final short NO_FLAGS = 0; + public static final short NO_FLAGS = 0; private boolean translatingWhile = false; @@ -511,7 +511,7 @@ private RubyNode translateBlockAndLambda(Nodes.Node node, Nodes.Node parametersN for (int i = 1; i <= maximum; i++) { String name = numberedParameterNames[i]; - requireds[i - 1] = new Nodes.RequiredParameterNode(name, 0, 0); + requireds[i - 1] = new Nodes.RequiredParameterNode(NO_FLAGS, name, 0, 0); } parameters = new Nodes.ParametersNode(requireds, EMPTY_NODE_ARRAY, null, EMPTY_NODE_ARRAY, @@ -1665,7 +1665,7 @@ public RubyNode visitFloatNode(Nodes.FloatNode node) { public RubyNode visitForNode(Nodes.ForNode node) { final String parameterName = environment.allocateLocalTemp("for"); - final var requireds = new Nodes.Node[]{ new Nodes.RequiredParameterNode(parameterName, 0, 0) }; + final var requireds = new Nodes.Node[]{ new Nodes.RequiredParameterNode(NO_FLAGS, parameterName, 0, 0) }; final var parameters = new Nodes.ParametersNode(requireds, Nodes.Node.EMPTY_ARRAY, null, Nodes.Node.EMPTY_ARRAY, Nodes.Node.EMPTY_ARRAY, null, null, 0, 0); final var blockParameters = new Nodes.BlockParametersNode(parameters, Nodes.Node.EMPTY_ARRAY, 0, 0); From 0a3f213e1152f40e5415df9979690c2899ee8bb5 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Wed, 17 Jan 2024 20:37:33 +0200 Subject: [PATCH 046/131] Refactor ParsingOptions class --- .../parser/YARPTranslatorDriver.java | 36 +++--- src/yarp/java/org/prism/Parser.java | 113 +----------------- src/yarp/java/org/prism/ParsingOptions.java | 82 +++++++++++++ 3 files changed, 102 insertions(+), 129 deletions(-) create mode 100644 src/yarp/java/org/prism/ParsingOptions.java diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java index a2a7b9d8a86b..bba398ca096f 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java @@ -44,6 +44,7 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.source.Source; import com.oracle.truffle.api.source.SourceSection; +import org.prism.ParsingOptions; import org.truffleruby.RubyContext; import org.truffleruby.RubyLanguage; import org.truffleruby.annotations.Split; @@ -432,13 +433,22 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang byte[] sourceBytes = rubySource.getBytes(); org.prism.Parser.loadLibrary(language.getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX); + byte[] filepath; + int line = rubySource.getLineOffset() + 1; + byte[] encoding = StringOperations.encodeAsciiBytes(rubySource.getEncoding().name.toString()); // encoding name is supposed to contain only ASCII characters + boolean frozenStringLiteral = configuration.isFrozenStringLiteral(); + boolean verbose = true; // Use CRuby syntax version 0 - it's the latest. We should select 3.3.0 instead. // But https://github.com/ruby/prism/pull/2118#discussion_r1445987020, so latest for now. - Parser.ParsingOptions options; + byte version = (byte) 0; + byte[][][] scopes; + if (rubySource.isEval()) { + filepath = rubySource.getSourcePath().getBytes(rubySource.getEncoding().jcoding.getCharset()); // encoding of the eval's String argument + int scopesCount = localVariableNames.size(); Charset sourceCharset = rubySource.getEncoding().jcoding.getCharset(); - byte[][][] scopes = new byte[scopesCount][][]; + scopes = new byte[scopesCount][][]; for (int i = 0; i < scopesCount; i++) { // Local variables are in order from inner scope to outer one, but Prism expects order from outer to inner. @@ -453,28 +463,16 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang scopes[i] = namesBytes; } - options = new Parser.ParsingOptions( - rubySource.getSourcePath().getBytes(rubySource.getEncoding().jcoding.getCharset()), // encoding of the eval's String argument - rubySource.getLineOffset() + 1, - StringOperations.encodeAsciiBytes(rubySource.getEncoding().name.toString()), // encoding name is supposed to contain only ASCII characters - configuration.isFrozenStringLiteral(), - false, // isSuppressWarnings, - (byte) 0, - scopes); } else { assert localVariableNames.isEmpty(); // parsing of the whole source file cannot have outer scopes - options = new Parser.ParsingOptions( - rubySource.getSourcePath().getBytes(StandardCharsets.UTF_8), // filesystem encoding, that is supposed to be always UTF-8 - rubySource.getLineOffset() + 1, - StringOperations.encodeAsciiBytes(rubySource.getEncoding().name.toString()), // encoding name is supposed to contain only ASCII characters - configuration.isFrozenStringLiteral(), - false, // isSuppressWarnings, - (byte) 0, - new byte[0][][]); + filepath = rubySource.getSourcePath().getBytes(StandardCharsets.UTF_8); // filesystem encoding, that is supposed to be always UTF-8 + scopes = new byte[0][][]; } - byte[] serializedBytes = Parser.parseAndSerialize(sourceBytes, options); + byte[] parsingOptions = ParsingOptions.serialize(filepath, line, encoding, frozenStringLiteral, verbose, + version, scopes); + byte[] serializedBytes = Parser.parseAndSerialize(sourceBytes, parsingOptions); Nodes.Source yarpSource = createYARPSource(sourceBytes, rubySource); parseEnvironment.yarpSource = yarpSource; diff --git a/src/yarp/java/org/prism/Parser.java b/src/yarp/java/org/prism/Parser.java index 2f7f819303f2..3e43c7f5d9b0 100644 --- a/src/yarp/java/org/prism/Parser.java +++ b/src/yarp/java/org/prism/Parser.java @@ -1,105 +1,6 @@ package org.prism; -import java.io.ByteArrayOutputStream; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; - -public class Parser { - - public static class ParsingOptions { - /** the name of the file that is currently being parsed */ - private final byte[] path; - /** the line within the file that the parser starts on. This value is 0-indexed */ - private final int startLineNumber; - /** the name of the encoding that the source file is in */ - private final byte[] encoding; - /** whether or not the frozen string literal option has been set */ - private final boolean isFrozenStringLiteral; - /** whether or not we should suppress warnings. */ - private final boolean isSuppressWarnings; - /** code of Ruby version which syntax will be used to parse */ - private final byte syntaxVersion; - /** scopes surrounding the code that is being parsed with local variable names defined in every scope */ - private final byte[][][] scopes; - - public ParsingOptions( - byte[] path, - int startLineNumber, - byte[] encoding, - boolean isFrozenStringLiteral, - boolean isSuppressWarnings, - byte syntaxVersion, - byte[][][] scopes) { - this.path = path; - this.startLineNumber = startLineNumber; - this.encoding = encoding; - this.isFrozenStringLiteral = isFrozenStringLiteral; - this.isSuppressWarnings = isSuppressWarnings; - this.syntaxVersion = syntaxVersion; - this.scopes = scopes; - } - - public byte[] serialize() { - final ByteArrayOutputStream output = new ByteArrayOutputStream(); - - // path - write(output, serializeInt(path.length)); - write(output, path); - - // line number - write(output, serializeInt(startLineNumber)); - - // encoding - write(output, serializeInt(encoding.length)); - write(output, encoding); - - // isFrozenStringLiteral - if (isFrozenStringLiteral) { - output.write(1); - } else { - output.write(0); - } - - // isSuppressWarnings - if (isSuppressWarnings) { - output.write(1); - } else { - output.write(0); - } - - // version - output.write(syntaxVersion); - - // scopes - - // number of scopes - write(output, serializeInt(scopes.length)); - // local variables in each scope - for (byte[][] scope : scopes) { - // number of locals - write(output, serializeInt(scope.length)); - - // locals - for (byte[] local : scope) { - write(output, serializeInt(local.length)); - write(output, local); - } - } - - return output.toByteArray(); - } - - private static void write(ByteArrayOutputStream output, byte[] bytes) { - // Note: we cannot use output.writeBytes(local) because that's Java 11 - output.write(bytes, 0, bytes.length); - } - - private byte[] serializeInt(int n) { - ByteBuffer buffer = ByteBuffer.allocate(4).order(ByteOrder.nativeOrder()); - buffer.putInt(n); - return buffer.array(); - } - } +public abstract class Parser { public static void loadLibrary(String path) { System.load(path); @@ -108,15 +9,7 @@ public static void loadLibrary(String path) { public static native byte[] parseAndSerialize(byte[] source, byte[] options); public static byte[] parseAndSerialize(byte[] source) { - return parseAndSerialize(source, (byte[]) null); - } - - public static byte[] parseAndSerialize(byte[] source, ParsingOptions options) { - if (options != null) { - return parseAndSerialize(source, options.serialize()); - } else { - return parseAndSerialize(source); - } + return parseAndSerialize(source, null); } -} +} \ No newline at end of file diff --git a/src/yarp/java/org/prism/ParsingOptions.java b/src/yarp/java/org/prism/ParsingOptions.java new file mode 100644 index 000000000000..ab82b6591c8a --- /dev/null +++ b/src/yarp/java/org/prism/ParsingOptions.java @@ -0,0 +1,82 @@ +package org.prism; + +import java.io.ByteArrayOutputStream; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; + +// @formatter:off +public abstract class ParsingOptions { + /** Serialize parsing options into byte array. + * + * @param filepath the name of the file that is currently being parsed + * @param line the line within the file that the parser starts on. This value is 0-indexed + * @param encoding the name of the encoding that the source file is in + * @param frozenStringLiteral whether the frozen string literal option has been set + * @param verbose whether the parser emits warnings + * @param version code of Ruby version which syntax will be used to parse + * @param scopes scopes surrounding the code that is being parsed with local variable names defined in every scope + * ordered from the outermost scope to the innermost one */ + public static byte[] serialize(byte[] filepath, int line, byte[] encoding, boolean frozenStringLiteral, + boolean verbose, byte version, byte[][][] scopes) { + final ByteArrayOutputStream output = new ByteArrayOutputStream(); + + // filepath + write(output, serializeInt(filepath.length)); + write(output, filepath); + + // line + write(output, serializeInt(line)); + + // encoding + write(output, serializeInt(encoding.length)); + write(output, encoding); + + // frozenStringLiteral + if (frozenStringLiteral) { + output.write(1); + } else { + output.write(0); + } + + // verbose + boolean suppressWarnings = !verbose; + if (suppressWarnings) { + output.write(1); + } else { + output.write(0); + } + + // version + output.write(version); + + // scopes + + // number of scopes + write(output, serializeInt(scopes.length)); + // local variables in each scope + for (byte[][] scope : scopes) { + // number of locals + write(output, serializeInt(scope.length)); + + // locals + for (byte[] local : scope) { + write(output, serializeInt(local.length)); + write(output, local); + } + } + + return output.toByteArray(); + } + + private static void write(ByteArrayOutputStream output, byte[] bytes) { + // Note: we cannot use output.writeBytes(local) because that's Java 11 + output.write(bytes, 0, bytes.length); + } + + private static byte[] serializeInt(int n) { + ByteBuffer buffer = ByteBuffer.allocate(4).order(ByteOrder.nativeOrder()); + buffer.putInt(n); + return buffer.array(); + } +} +// @formatter:on From 10306d09f8eef84a5fedd8184d4a06f167fbd13f Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 4 Jan 2024 20:28:42 +0200 Subject: [PATCH 047/131] Add specs for forwarding multiple _ parameters to super --- spec/ruby/language/fixtures/super.rb | 48 ++++++ spec/ruby/language/super_spec.rb | 7 + spec/tags/language/super_tags.txt | 1 + spec/tags/truffle/parsing/parsing_tags.txt | 1 + ...clared_multiple_underscore_parameters.yaml | 151 ++++++++++++++++++ 5 files changed, 208 insertions(+) create mode 100644 spec/tags/language/super_tags.txt create mode 100644 spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_multiple_underscore_parameters.yaml diff --git a/spec/ruby/language/fixtures/super.rb b/spec/ruby/language/fixtures/super.rb index 94a2a91be0df..c5bdcf0e4027 100644 --- a/spec/ruby/language/fixtures/super.rb +++ b/spec/ruby/language/fixtures/super.rb @@ -539,6 +539,30 @@ def m(*args) args end + def m3(*args) + args + end + + def m4(*args) + args + end + + def m_default(*args) + args + end + + def m_rest(*args) + args + end + + def m_pre_default_rest_post(*args) + args + end + + def m_kwrest(**kw) + kw + end + def m_modified(*args) args end @@ -549,6 +573,30 @@ def m(_, _) super end + def m3(_, _, _) + super + end + + def m4(_, _, _, _) + super + end + + def m_default(_ = 0) + super + end + + def m_rest(*_) + super + end + + def m_pre_default_rest_post(_, _, _=:a, _=:b, *_, _, _) + super + end + + def m_kwrest(**_) + super + end + def m_modified(_, _) _ = 14 super diff --git a/spec/ruby/language/super_spec.rb b/spec/ruby/language/super_spec.rb index d22c60360567..a98b3b3091ef 100644 --- a/spec/ruby/language/super_spec.rb +++ b/spec/ruby/language/super_spec.rb @@ -335,6 +335,13 @@ def obj.foobar(array) it "without explicit arguments that are '_'" do SuperSpecs::ZSuperWithUnderscores::B.new.m(1, 2).should == [1, 2] + SuperSpecs::ZSuperWithUnderscores::B.new.m3(1, 2, 3).should == [1, 2, 3] + SuperSpecs::ZSuperWithUnderscores::B.new.m4(1, 2, 3, 4).should == [1, 2, 3, 4] + SuperSpecs::ZSuperWithUnderscores::B.new.m_default(1).should == [1] + SuperSpecs::ZSuperWithUnderscores::B.new.m_default.should == [0] + SuperSpecs::ZSuperWithUnderscores::B.new.m_pre_default_rest_post(1, 2, 3, 4, 5, 6, 7).should == [1, 2, 3, 4, 5, 6, 7] + SuperSpecs::ZSuperWithUnderscores::B.new.m_rest(1, 2).should == [1, 2] + SuperSpecs::ZSuperWithUnderscores::B.new.m_kwrest(a: 1).should == {a: 1} end it "without explicit arguments that are '_' including any modifications" do diff --git a/spec/tags/language/super_tags.txt b/spec/tags/language/super_tags.txt new file mode 100644 index 000000000000..89bd6320e8f2 --- /dev/null +++ b/spec/tags/language/super_tags.txt @@ -0,0 +1 @@ +fails:The super keyword without explicit arguments that are '_' diff --git a/spec/tags/truffle/parsing/parsing_tags.txt b/spec/tags/truffle/parsing/parsing_tags.txt index a9b4cac8ee04..9defa423e79e 100644 --- a/spec/tags/truffle/parsing/parsing_tags.txt +++ b/spec/tags/truffle/parsing/parsing_tags.txt @@ -2,3 +2,4 @@ # See https://github.com/ruby/prism/issues/1997 fails:Parsing a Regexp (encoding / when there are non-ASCII characters in a literal) case is parsed correctly fails:Parsing a Regexp (encoding in boolean context / when there are non-ASCII characters in a literal) case is parsed correctly +fails:Parsing a Method call (super / in a method body without explicit arguments when declared multiple underscore parameters) case is parsed correctly diff --git a/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_multiple_underscore_parameters.yaml b/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_multiple_underscore_parameters.yaml new file mode 100644 index 000000000000..df7e6e9d1288 --- /dev/null +++ b/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_multiple_underscore_parameters.yaml @@ -0,0 +1,151 @@ +subject: "Method call" +description: super / in a method body without explicit arguments when declared multiple underscore parameters +notes: > + Is represented by SuperCallNode and ReadZSuperArgumentsNode nodes +focused_on_node: "org.truffleruby.language.methods.LiteralMethodDefinitionNode" +ruby: | + def foo(_, _, _) + super + end +ast: | + LiteralMethodDefinitionNode + attributes: + callTargetSupplier = org.truffleruby.language.methods.CachedLazyCallTargetSupplier@... + flags = 1 + isDefSingleton = false + name = "foo" + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 3, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = _, type = req), ArgumentDescriptor(name = _$0, type = req), ArgumentDescriptor(name = _$0, type = req)]) + call targets: + RubyMethodRootNode + attributes: + arityForCheck = Arity{preRequired = 3, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false} + callTarget = Object#foo + checkArityProfile = false + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:_, #3:_$0, #4:%method_block_arg} + instrumentationBits = 0 + keywordArguments = false + localReturnProfile = false + lock = java.util.concurrent.locks.ReentrantLock@...[Unlocked] + matchingReturnProfile = false + nonMatchingReturnProfile = false + polyglotRef = org.truffleruby.RubyLanguage@... + retryProfile = false + returnID = org.truffleruby.language.control.ReturnID@... + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 3, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = _, type = req), ArgumentDescriptor(name = _$0, type = req), ArgumentDescriptor(name = _$0, type = req)]) + split = HEURISTIC + children: + body = + SequenceNode + attributes: + flags = 12 + children: + body = [ + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 0 # (self) + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadSelfNode + attributes: + flags = 0 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # _ + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadPreArgumentNode + attributes: + flags = 0 + index = 0 + keywordArguments = false + missingArgumentBehavior = RUNTIME_ERROR + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # _$0 + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadPreArgumentNode + attributes: + flags = 0 + index = 1 + keywordArguments = false + missingArgumentBehavior = RUNTIME_ERROR + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # _$0 + children: + valueNode = + ProfileArgumentNodeGen + attributes: + flags = 0 + children: + childNode_ = + ReadPreArgumentNode + attributes: + flags = 0 + index = 2 + keywordArguments = false + missingArgumentBehavior = RUNTIME_ERROR + SaveMethodBlockNode + attributes: + flags = 0 + slot = 4 + SuperCallNode + attributes: + descriptor = NoKeywordArgumentsDescriptor + emptyKeywordsProfile = false + flags = 0 + isSplatted = false + lastArgIsNotHashProfile = false + notEmptyKeywordsProfile = false + notRuby2KeywordsHashProfile = false + children: + arguments = + ReadZSuperArgumentsNode + attributes: + flags = 0 + restArgIndex = -1 + children: + reloadNodes = [ + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 2 # _ + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # _$0 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 3 # _$0 + type = FRAME_LOCAL + ] + block = + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 4 # %method_block_arg + type = FRAME_LOCAL + ] \ No newline at end of file From dbe12703f85ef466a07d6d42ec88021ff830216b Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Wed, 17 Jan 2024 14:00:58 +0100 Subject: [PATCH 048/131] Fix forwarding multiple _ to super --- spec/tags/truffle/parsing/parsing_tags.txt | 1 - ...clared_multiple_underscore_parameters.yaml | 125 +++++++++++++++--- .../parser/YARPLoadArgumentsTranslator.java | 57 ++++++-- .../parser/YARPReloadArgumentsTranslator.java | 111 +++++++++++----- 4 files changed, 224 insertions(+), 70 deletions(-) diff --git a/spec/tags/truffle/parsing/parsing_tags.txt b/spec/tags/truffle/parsing/parsing_tags.txt index 9defa423e79e..a9b4cac8ee04 100644 --- a/spec/tags/truffle/parsing/parsing_tags.txt +++ b/spec/tags/truffle/parsing/parsing_tags.txt @@ -2,4 +2,3 @@ # See https://github.com/ruby/prism/issues/1997 fails:Parsing a Regexp (encoding / when there are non-ASCII characters in a literal) case is parsed correctly fails:Parsing a Regexp (encoding in boolean context / when there are non-ASCII characters in a literal) case is parsed correctly -fails:Parsing a Method call (super / in a method body without explicit arguments when declared multiple underscore parameters) case is parsed correctly diff --git a/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_multiple_underscore_parameters.yaml b/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_multiple_underscore_parameters.yaml index df7e6e9d1288..9c160ab7d35b 100644 --- a/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_multiple_underscore_parameters.yaml +++ b/spec/truffle/parsing/fixtures/method_calls/super/in_method_body_without_explicit_arguments_when_declared_multiple_underscore_parameters.yaml @@ -1,10 +1,13 @@ subject: "Method call" description: super / in a method body without explicit arguments when declared multiple underscore parameters notes: > - Is represented by SuperCallNode and ReadZSuperArgumentsNode nodes + Is represented by SuperCallNode and ReadZSuperArgumentsNode nodes. + + All the "_" but the first one are stored in temporary local variables %_2, %_3, etc. +yarp_specific: true # store in local variables all the "_" parameters, not the first two focused_on_node: "org.truffleruby.language.methods.LiteralMethodDefinitionNode" ruby: | - def foo(_, _, _) + def foo(_, _, _=0, _=1, *_, _, _) super end ast: | @@ -14,14 +17,14 @@ ast: | flags = 1 isDefSingleton = false name = "foo" - sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 3, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = _, type = req), ArgumentDescriptor(name = _$0, type = req), ArgumentDescriptor(name = _$0, type = req)]) + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 2, optional = 2, hasRest = true, isImplicitRest = false, postRequired = 2, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = _, type = req), ArgumentDescriptor(name = _, type = req), ArgumentDescriptor(name = _, type = opt), ArgumentDescriptor(name = _, type = opt), ArgumentDescriptor(name = _, type = rest), ArgumentDescriptor(name = _, type = req), ArgumentDescriptor(name = _, type = req)]) call targets: RubyMethodRootNode attributes: - arityForCheck = Arity{preRequired = 3, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false} + arityForCheck = Arity{preRequired = 2, optional = 2, hasRest = true, isImplicitRest = false, postRequired = 2, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false} callTarget = Object#foo checkArityProfile = false - frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:_, #3:_$0, #4:%method_block_arg} + frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:_, #3:%_2, #4:%method_block_arg, #5:%_3, #6:%_4, #7:%_5, #8:%_6, #9:%_7} instrumentationBits = 0 keywordArguments = false localReturnProfile = false @@ -31,7 +34,7 @@ ast: | polyglotRef = org.truffleruby.RubyLanguage@... retryProfile = false returnID = org.truffleruby.language.control.ReturnID@... - sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 3, optional = 0, hasRest = false, isImplicitRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = _, type = req), ArgumentDescriptor(name = _$0, type = req), ArgumentDescriptor(name = _$0, type = req)]) + sharedMethodInfo = SharedMethodInfo(staticLexicalScope = :: Object, arity = Arity{preRequired = 2, optional = 2, hasRest = true, isImplicitRest = false, postRequired = 2, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = false}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = _, type = req), ArgumentDescriptor(name = _, type = req), ArgumentDescriptor(name = _, type = opt), ArgumentDescriptor(name = _, type = opt), ArgumentDescriptor(name = _, type = rest), ArgumentDescriptor(name = _, type = req), ArgumentDescriptor(name = _, type = req)]) split = HEURISTIC children: body = @@ -74,7 +77,7 @@ ast: | WriteLocalVariableNode attributes: flags = 0 - frameSlot = 3 # _$0 + frameSlot = 3 # %_2 children: valueNode = ProfileArgumentNodeGen @@ -88,33 +91,93 @@ ast: | index = 1 keywordArguments = false missingArgumentBehavior = RUNTIME_ERROR + SaveMethodBlockNode + attributes: + flags = 0 + slot = 4 WriteLocalVariableNode attributes: flags = 0 - frameSlot = 3 # _$0 + frameSlot = 5 # %_3 children: valueNode = - ProfileArgumentNodeGen + ReadOptionalArgumentNode attributes: flags = 0 + index = 2 + keywordArguments = false + minimum = 5 children: - childNode_ = - ReadPreArgumentNode + defaultValue = + IntegerFixnumLiteralNode attributes: flags = 0 - index = 2 - keywordArguments = false - missingArgumentBehavior = RUNTIME_ERROR - SaveMethodBlockNode + value = 0 + WriteLocalVariableNode attributes: flags = 0 - slot = 4 + frameSlot = 6 # %_4 + children: + valueNode = + ReadOptionalArgumentNode + attributes: + flags = 0 + index = 3 + keywordArguments = false + minimum = 6 + children: + defaultValue = + IntegerFixnumLiteralNode + attributes: + flags = 0 + value = 1 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 7 # %_5 + children: + valueNode = + ReadRestArgumentNode + attributes: + flags = 0 + keywordArguments = false + markKeywordHashWithFlag = false + postArgumentsCount = 2 + startIndex = 4 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 8 # %_6 + children: + valueNode = + ReadPostArgumentNode + attributes: + flags = 0 + hasRest = true + indexFromCount = 1 + keywordArguments = false + optional = 2 + required = 4 + WriteLocalVariableNode + attributes: + flags = 0 + frameSlot = 9 # %_7 + children: + valueNode = + ReadPostArgumentNode + attributes: + flags = 0 + hasRest = true + indexFromCount = 2 + keywordArguments = false + optional = 2 + required = 4 SuperCallNode attributes: descriptor = NoKeywordArgumentsDescriptor emptyKeywordsProfile = false - flags = 0 - isSplatted = false + flags = 1 + isSplatted = true lastArgIsNotHashProfile = false notEmptyKeywordsProfile = false notRuby2KeywordsHashProfile = false @@ -123,7 +186,7 @@ ast: | ReadZSuperArgumentsNode attributes: flags = 0 - restArgIndex = -1 + restArgIndex = 4 children: reloadNodes = [ ReadLocalVariableNode @@ -134,12 +197,32 @@ ast: | ReadLocalVariableNode attributes: flags = 0 - frameSlot = 3 # _$0 + frameSlot = 3 # %_2 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 5 # %_3 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 6 # %_4 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 7 # %_5 + type = FRAME_LOCAL + ReadLocalVariableNode + attributes: + flags = 0 + frameSlot = 9 # %_7 type = FRAME_LOCAL ReadLocalVariableNode attributes: flags = 0 - frameSlot = 3 # _$0 + frameSlot = 8 # %_6 type = FRAME_LOCAL ] block = diff --git a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java index a655574bc8f9..8f70350f89a9 100644 --- a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java @@ -13,6 +13,7 @@ import java.util.List; import com.oracle.truffle.api.CompilerDirectives; +import org.truffleruby.Layouts; import org.truffleruby.RubyLanguage; import org.truffleruby.language.RubyNode; import org.truffleruby.language.arguments.CheckNoKeywordArgumentsNode; @@ -30,6 +31,10 @@ import org.prism.AbstractNodeVisitor; import org.prism.Nodes; +/** Translates method/block parameters and assign local variables. + * + * Parameters should be iterated in the same order {@link org.truffleruby.parser.YARPReloadArgumentsTranslator} iterates + * to handle multiple "_" parameters (and parameters with "_" prefix) correctly. */ public final class YARPLoadArgumentsTranslator extends AbstractNodeVisitor { private static final short NO_FLAGS = YARPTranslator.NO_FLAGS; @@ -47,9 +52,10 @@ private enum State { private final Nodes.ParametersNode parameters; /** position of actual argument in a frame that is being evaluated/read to match a read node and actual argument */ - private int index; + private int index = 0; /** to distinguish pre and post Nodes.RequiredParameterNode parameters */ private State state; + private int repeatedParameterCounter = 2; private final RubyLanguage language; private final TranslatorEnvironment environment; @@ -86,9 +92,8 @@ private RubyNode translateWithParameters() { if (parameters.requireds.length > 0) { state = State.PRE; - index = 0; for (var node : parameters.requireds) { - sequence.add(node.accept(this)); // Nodes.RequiredParameterNode is expected here + sequence.add(node.accept(this)); // Nodes.RequiredParameterNode, Nodes.MultiTargetNode are expected here index++; } } @@ -100,7 +105,6 @@ private RubyNode translateWithParameters() { } if (parameters.optionals.length > 0) { - index = parameters.requireds.length; for (var node : parameters.optionals) { sequence.add(node.accept(this)); // Nodes.OptionalParameterNode is expected here index++; @@ -123,7 +127,7 @@ private RubyNode translateWithParameters() { index = -1; for (int i = parameters.posts.length - 1; i >= 0; i--) { - sequence.add(parameters.posts[i].accept(this)); // Nodes.RequiredParameterNode is expected here + sequence.add(parameters.posts[i].accept(this)); // Nodes.RequiredParameterNode, Nodes.MultiTargetNode are expected here index--; } } @@ -212,7 +216,14 @@ public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) { throw new IllegalStateException(); } - final int slot = environment.findFrameSlot(node.name); + final int slot; + if (node.isRepeatedParameter()) { + String name = createNameForRepeatedParameter(node.name); + slot = environment.declareVar(name); + } else { + slot = environment.findFrameSlot(node.name); + } + return new WriteLocalVariableNode(slot, readNode); } @@ -230,7 +241,6 @@ public RubyNode visitOptionalKeywordParameterNode(Nodes.OptionalKeywordParameter public RubyNode visitOptionalParameterNode(Nodes.OptionalParameterNode node) { final RubyNode readNode; final RubyNode defaultValue = node.value.accept(this); - final int slot = environment.declareVar(node.name); int minimum = index + 1 + parameters.posts.length; readNode = new ReadOptionalArgumentNode( @@ -239,6 +249,14 @@ public RubyNode visitOptionalParameterNode(Nodes.OptionalParameterNode node) { hasKeywordArguments(), defaultValue); + final int slot; + if (node.isRepeatedParameter()) { + String name = createNameForRepeatedParameter(node.name); + slot = environment.declareVar(name); + } else { + slot = environment.findFrameSlot(node.name); + } + return new WriteLocalVariableNode(slot, readNode); } @@ -250,12 +268,22 @@ public RubyNode visitRestParameterNode(Nodes.RestParameterNode node) { int to = -parameters.posts.length; readNode = new ReadRestArgumentNode(from, -to, hasKeywordArguments()); - final String name = (node.name != null) ? node.name : TranslatorEnvironment.DEFAULT_REST_NAME; + final int slot; - // When a rest parameter in a block is nameless then YARP doesn't add '*' to block's locals - // (what is expected as far as arguments forwarding doesn't work in blocks), and we don't - // declare this hidden variable beforehand. So declare it here right before usage. - final int slot = environment.declareVar(name); + if (node.name != null) { + if (node.isRepeatedParameter()) { + String name = createNameForRepeatedParameter(node.name); + slot = environment.declareVar(name); + } else { + slot = environment.findFrameSlot(node.name); + } + } else { + // When a rest parameter in a block is nameless then YARP doesn't add '*' to block's locals + // (what is expected as far as arguments forwarding doesn't work in blocks), and we don't + // declare this hidden variable beforehand. So declare it here right before usage. + String name = TranslatorEnvironment.DEFAULT_REST_NAME; + slot = environment.declareVar(name); + } return new WriteLocalVariableNode(slot, readNode); } @@ -338,4 +366,9 @@ private boolean hasRest() { return parameters.rest != null; } + private String createNameForRepeatedParameter(String name) { + int count = repeatedParameterCounter++; + return Layouts.TEMP_PREFIX + name + count; + } + } diff --git a/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java index 4aeb7ada5d87..e01458459454 100644 --- a/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java @@ -10,11 +10,13 @@ package org.truffleruby.parser; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import com.oracle.truffle.api.CompilerDirectives; import org.prism.AbstractNodeVisitor; import org.prism.Nodes; +import org.truffleruby.Layouts; import org.truffleruby.RubyLanguage; import org.truffleruby.core.hash.ConcatHashLiteralNode; import org.truffleruby.core.hash.HashLiteralNode; @@ -26,7 +28,10 @@ /** Produces code to reload arguments from local variables back into the arguments array. Only works for simple cases. * Used for zsuper calls which pass the same arguments, but will pick up modifications made to them in the method so - * far. */ + * far. + * + * Parameters should be iterated in the same order {@link org.truffleruby.parser.YARPLoadArgumentsTranslator} iterates + * to handle multiple "_" parameters (and parameters with "_" prefix) correctly. */ public final class YARPReloadArgumentsTranslator extends AbstractNodeVisitor { private final RubyLanguage language; @@ -35,6 +40,7 @@ public final class YARPReloadArgumentsTranslator extends AbstractNodeVisitor sequence = new ArrayList<>(); - for (var node : parametersNode.requireds) { - sequence.add(node.accept(this)); // Nodes.RequiredParameterNode is expected here + for (var node : parameters.requireds) { + sequence.add(node.accept(this)); // Nodes.RequiredParameterNode, Nodes.MultiTargetNode are expected here index++; } - for (var node : parametersNode.optionals) { + for (var node : parameters.optionals) { sequence.add(node.accept(this)); // Nodes.OptionalParameterNode is expected here index++; } - if (parametersNode.rest != null) { + if (parameters.rest != null) { restParameterIndex = index; - sequence.add(parametersNode.rest.accept(this)); // Nodes.RestParameterNode is expected here - } - - // ... parameter (so-called "forward arguments") means there is implicit * parameter - if (parametersNode.keyword_rest instanceof Nodes.ForwardingParameterNode) { - restParameterIndex = parametersNode.requireds.length + parametersNode.optionals.length; - final var readRestNode = yarpTranslator.getEnvironment().findLocalVarNode( - TranslatorEnvironment.FORWARDED_REST_NAME, - null); - sequence.add(readRestNode); + sequence.add(parameters.rest.accept(this)); // Nodes.RestParameterNode is expected here } - int postCount = parametersNode.posts.length; - if (postCount > 0) { - index = -postCount; - for (var node : parametersNode.posts) { - sequence.add(node.accept(this)); // Nodes.RequiredParameterNode is expected here - index++; - } + index = -1; + // post parameters were translated in reverse order + // iterate them in the same order to handle multiple "_" properly + ArrayList postsSequence = new ArrayList<>(); + for (int i = parameters.posts.length - 1; i >= 0; i--) { + postsSequence.add(parameters.posts[i].accept(this)); // Nodes.RequiredParameterNode, Nodes.MultiTargetNode are expected here + index--; } + // but we need to pass parameters to super call in direct order + Collections.reverse(postsSequence); + sequence.addAll(postsSequence); RubyNode kwArgsNode = null; - if (parametersNode.keywords.length > 0) { - final int keywordsCount = parametersNode.keywords.length; + if (parameters.keywords.length > 0) { + final int keywordsCount = parameters.keywords.length; RubyNode[] keysAndValues = new RubyNode[keywordsCount * 2]; for (int i = 0; i < keywordsCount; i++) { // Nodes.RequiredKeywordParameterNode/Nodes.OptionalKeywordParameterNode are expected here - final Nodes.Node keyword = parametersNode.keywords[i]; + final Nodes.Node keyword = parameters.keywords[i]; final String name; if (keyword instanceof Nodes.OptionalKeywordParameterNode optional) { @@ -113,18 +113,18 @@ public RubyNode[] reload(Nodes.ParametersNode parametersNode) { kwArgsNode = HashLiteralNode.create(keysAndValues, language); } - if (parametersNode.keyword_rest != null) { - if (parametersNode.keyword_rest instanceof Nodes.KeywordRestParameterNode) { - final RubyNode keyRest = parametersNode.keyword_rest.accept(this); + if (parameters.keyword_rest != null) { + if (parameters.keyword_rest instanceof Nodes.KeywordRestParameterNode) { + final RubyNode keyRest = parameters.keyword_rest.accept(this); if (kwArgsNode == null) { kwArgsNode = keyRest; } else { kwArgsNode = new ConcatHashLiteralNode(new RubyNode[]{ kwArgsNode, keyRest }); } - } else if (parametersNode.keyword_rest instanceof Nodes.NoKeywordsParameterNode) { + } else if (parameters.keyword_rest instanceof Nodes.NoKeywordsParameterNode) { // do nothing - } else if (parametersNode.keyword_rest instanceof Nodes.ForwardingParameterNode) { + } else if (parameters.keyword_rest instanceof Nodes.ForwardingParameterNode) { // do nothing - it's already handled in the #reload method // NOTE: don't handle '&' for now as far as anonymous & isn't supported yet } else { @@ -136,8 +136,15 @@ public RubyNode[] reload(Nodes.ParametersNode parametersNode) { sequence.add(kwArgsNode); } - // ... parameter (so-called "forward arguments") means there is implicit ** parameter - if (parametersNode.keyword_rest instanceof Nodes.ForwardingParameterNode) { + if (parameters.keyword_rest instanceof Nodes.ForwardingParameterNode) { + // ... parameter (so-called "forward arguments") means there is implicit * parameter + restParameterIndex = parameters.requireds.length + parameters.optionals.length; + final var readRestNode = yarpTranslator.getEnvironment().findLocalVarNode( + TranslatorEnvironment.FORWARDED_REST_NAME, + null); + sequence.add(readRestNode); + + // ... parameter (so-called "forward arguments") means there is implicit ** parameter final var readKeyRestNode = yarpTranslator.getEnvironment() .findLocalVarNode(TranslatorEnvironment.FORWARDED_KEYWORD_REST_NAME, null); sequence.add(readKeyRestNode); @@ -148,12 +155,28 @@ public RubyNode[] reload(Nodes.ParametersNode parametersNode) { @Override public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) { - return yarpTranslator.getEnvironment().findLocalVarNode(node.name, null); + final String name; + + if (node.isRepeatedParameter()) { + name = createNameForRepeatedParameter(node.name); + } else { + name = node.name; + } + + return yarpTranslator.getEnvironment().findLocalVarNode(name, null); } @Override public RubyNode visitOptionalParameterNode(Nodes.OptionalParameterNode node) { - return yarpTranslator.getEnvironment().findLocalVarNode(node.name, null); + final String name; + + if (node.isRepeatedParameter()) { + name = createNameForRepeatedParameter(node.name); + } else { + name = node.name; + } + + return yarpTranslator.getEnvironment().findLocalVarNode(name, null); } @Override @@ -164,7 +187,18 @@ public RubyNode visitMultiTargetNode(Nodes.MultiTargetNode node) { @Override public RubyNode visitRestParameterNode(Nodes.RestParameterNode node) { - final String name = node.name != null ? node.name : TranslatorEnvironment.DEFAULT_REST_NAME; + final String name; + + if (node.name != null) { + if (node.isRepeatedParameter()) { + name = createNameForRepeatedParameter(node.name); + } else { + name = node.name; + } + } else { + name = TranslatorEnvironment.DEFAULT_REST_NAME; + } + return yarpTranslator.getEnvironment().findLocalVarNode(name, null); } @@ -200,4 +234,9 @@ protected RubyNode defaultVisit(Nodes.Node node) { return yarpTranslator.defaultVisit(node); } + private String createNameForRepeatedParameter(String name) { + int count = repeatedParameterCounter++; + return Layouts.TEMP_PREFIX + name + count; + } + } From 27db973b8af37893618bc5b61dbc5a4ee6ad9145 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 18 Jan 2024 18:23:19 +0200 Subject: [PATCH 049/131] Use TranslatorEnvironment#findFrameSlot instead of TranslatorEnvironment#declareVar where possible --- .../parser/YARPLoadArgumentsTranslator.java | 19 ++++++++++++------- ...ParametersNodeToDestructureTranslator.java | 15 ++++++++++----- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java index 8f70350f89a9..5553a2d0f918 100644 --- a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java @@ -190,7 +190,7 @@ public RubyNode visitMultiTargetNode(Nodes.MultiTargetNode node) { @Override public RubyNode visitRequiredKeywordParameterNode(Nodes.RequiredKeywordParameterNode node) { - final int slot = environment.declareVar(node.name); + final int slot = environment.findFrameSlot(node.name); final var name = language.getSymbol(node.name); final var readNode = ReadKeywordArgumentNode.create(name, null); @@ -229,7 +229,7 @@ public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) { @Override public RubyNode visitOptionalKeywordParameterNode(Nodes.OptionalKeywordParameterNode node) { - final int slot = environment.declareVar(node.name); + final int slot = environment.findFrameSlot(node.name); final var name = language.getSymbol(node.name); final var value = node.value.accept(this); final var readNode = ReadKeywordArgumentNode.create(name, value); @@ -296,12 +296,17 @@ public RubyNode visitImplicitRestNode(Nodes.ImplicitRestNode node) { @Override public RubyNode visitKeywordRestParameterNode(Nodes.KeywordRestParameterNode node) { final RubyNode readNode = new ReadKeywordRestArgumentNode(language, arity); - final String name = (node.name != null) ? node.name : TranslatorEnvironment.DEFAULT_KEYWORD_REST_NAME; + final int slot; - // When a keyword rest parameter in a block is nameless then YARP doesn't add '**' to block's locals - // (what is expected as far as arguments forwarding doesn't work in blocks), and we don't declare this - // hidden variable beforehand. So declare it here right before usage. - final int slot = environment.declareVar(name); + if (node.name != null) { + slot = environment.findFrameSlot(node.name); + } else { + // When a keyword rest parameter in a block is nameless then YARP doesn't add '**' to block's locals + // (what is expected as far as arguments forwarding doesn't work in blocks), and we don't declare this + // hidden variable beforehand. So declare it here right before usage. + final String name = TranslatorEnvironment.DEFAULT_KEYWORD_REST_NAME; + slot = environment.declareVar(name); + } return new WriteLocalVariableNode(slot, readNode); } diff --git a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java index 99f0ad7b7621..e857a5edaa85 100644 --- a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java @@ -171,14 +171,13 @@ public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) { throw new IllegalStateException(); } - final int slot = environment.findFrameSlot(node.name); return new WriteLocalVariableNode(slot, readNode); } @Override public RubyNode visitOptionalKeywordParameterNode(Nodes.OptionalKeywordParameterNode node) { - final int slot = environment.declareVar(node.name); + final int slot = environment.findFrameSlot(node.name); final var defaultValue = node.value.accept(this); // keyword arguments couldn't be passed to a block in case of destructuring single Array argument, @@ -190,7 +189,7 @@ public RubyNode visitOptionalKeywordParameterNode(Nodes.OptionalKeywordParameter public RubyNode visitOptionalParameterNode(Nodes.OptionalParameterNode node) { final RubyNode readNode; final RubyNode defaultValue = node.value.accept(this); - final int slot = environment.declareVar(node.name); + final int slot = environment.findFrameSlot(node.name); int minimum = index + 1 + parameters.posts.length; // TODO CS 10-Jan-16 we should really hoist this check, or see if Graal does it for us @@ -225,8 +224,14 @@ public RubyNode visitKeywordRestParameterNode(Nodes.KeywordRestParameterNode nod // NOTE: we actually could do nothing if parameter is anonymous // as far as this translator handles a block parameters only, // but anonymous keyword rest forwarding doesn't work in blocks - final String name = (node.name != null) ? node.name : TranslatorEnvironment.DEFAULT_KEYWORD_REST_NAME; - final int slot = environment.declareVar(name); + final int slot; + + if (node.name != null) { + slot = environment.findFrameSlot(node.name); + } else { + final String name = TranslatorEnvironment.DEFAULT_KEYWORD_REST_NAME; + slot = environment.declareVar(name); + } // keyword arguments couldn't be passed to a block in case of destructuring single Array argument, // so immediately assign `{}` value From ac1d65f65cb231ef6a4b0d8a1624e107ac187e99 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 18 Jan 2024 18:48:32 +0200 Subject: [PATCH 050/131] Don't rely in specs on SyntaxError message - only on class name Prism emits different error and warning messages --- spec/ruby/command_line/dash_r_spec.rb | 5 ++++- spec/ruby/command_line/syntax_error_spec.rb | 10 ++++++++-- spec/ruby/shared/kernel/at_exit.rb | 5 ++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/spec/ruby/command_line/dash_r_spec.rb b/spec/ruby/command_line/dash_r_spec.rb index ea5bde5adf92..9f673c53dcc0 100644 --- a/spec/ruby/command_line/dash_r_spec.rb +++ b/spec/ruby/command_line/dash_r_spec.rb @@ -16,7 +16,10 @@ out = ruby_exe(fixture(__FILE__, "bad_syntax.rb"), options: "-r #{@test_file}", args: "2>&1", exit_status: 1) $?.should_not.success? out.should include("REQUIRED") - out.should include("syntax error") + + # it's tempting not to rely on error message and rely only on exception class name, + # but CRuby before 3.2 doesn't print class name for syntax error + out.should include_any_of("syntax error", "SyntaxError") end it "does not require the file if the main script file does not exist" do diff --git a/spec/ruby/command_line/syntax_error_spec.rb b/spec/ruby/command_line/syntax_error_spec.rb index 444ea9635cba..9ba87b9e2279 100644 --- a/spec/ruby/command_line/syntax_error_spec.rb +++ b/spec/ruby/command_line/syntax_error_spec.rb @@ -3,11 +3,17 @@ describe "The interpreter" do it "prints an error when given a file with invalid syntax" do out = ruby_exe(fixture(__FILE__, "bad_syntax.rb"), args: "2>&1", exit_status: 1) - out.should include "syntax error" + + # it's tempting not to rely on error message and rely only on exception class name, + # but CRuby before 3.2 doesn't print class name for syntax error + out.should include_any_of("syntax error", "SyntaxError") end it "prints an error when given code via -e with invalid syntax" do out = ruby_exe(nil, args: "-e 'a{' 2>&1", exit_status: 1) - out.should include "syntax error" + + # it's tempting not to rely on error message and rely only on exception class name, + # but CRuby before 3.2 doesn't print class name for syntax error + out.should include_any_of("syntax error", "SyntaxError") end end diff --git a/spec/ruby/shared/kernel/at_exit.rb b/spec/ruby/shared/kernel/at_exit.rb index 4f54c4b28333..16d41cb01c93 100644 --- a/spec/ruby/shared/kernel/at_exit.rb +++ b/spec/ruby/shared/kernel/at_exit.rb @@ -54,7 +54,10 @@ result = ruby_exe('{', options: "-r#{script}", args: "2>&1", exit_status: 1) $?.should_not.success? result.should.include?("handler ran\n") - result.should.include?("SyntaxError") + + # it's tempting not to rely on error message and rely only on exception class name, + # but CRuby before 3.2 doesn't print class name for syntax error + result.should include_any_of("syntax error", "SyntaxError") end it "calls the nested handler right after the outer one if a handler is nested into another handler" do From e5a8589e78132947936876a00e692cd8e239c81a Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Thu, 18 Jan 2024 19:43:53 +0200 Subject: [PATCH 051/131] Fix rescue with local variable capturing outside a method or block --- .../language/fixtures/rescue/top_level.rb | 7 ++ spec/ruby/language/rescue_spec.rb | 72 +++++++++++++++++++ .../rescue/capturing/with_attribute.yaml | 4 +- .../truffleruby/parser/YARPTranslator.java | 18 ++++- 4 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 spec/ruby/language/fixtures/rescue/top_level.rb diff --git a/spec/ruby/language/fixtures/rescue/top_level.rb b/spec/ruby/language/fixtures/rescue/top_level.rb new file mode 100644 index 000000000000..cb289b20f9d1 --- /dev/null +++ b/spec/ruby/language/fixtures/rescue/top_level.rb @@ -0,0 +1,7 @@ +# capturing in local variable at top-level + +begin + raise "message" +rescue => e + ScratchPad << e.message +end \ No newline at end of file diff --git a/spec/ruby/language/rescue_spec.rb b/spec/ruby/language/rescue_spec.rb index b91b52fa0f0a..69ed038fda9d 100644 --- a/spec/ruby/language/rescue_spec.rb +++ b/spec/ruby/language/rescue_spec.rb @@ -61,6 +61,78 @@ class ArbitraryException < StandardError end end + describe 'capturing in a local variable (that defines it)' do + it 'captures successfully in a method' do + ScratchPad.record [] + + def a + raise "message" + rescue => e + ScratchPad << e.message + end + + a + ScratchPad.recorded.should == ["message"] + end + + it 'captures successfully in a block' do + ScratchPad.record [] + + p = proc do + raise "message" + rescue => e + ScratchPad << e.message + end + + p.call + ScratchPad.recorded.should == ["message"] + end + + it 'captures successfully in a class' do + ScratchPad.record [] + + class RescueSpecs::C + raise "message" + rescue => e + ScratchPad << e.message + end + + ScratchPad.recorded.should == ["message"] + end + + it 'captures successfully in a module' do + ScratchPad.record [] + + module RescueSpecs::M + raise "message" + rescue => e + ScratchPad << e.message + end + + ScratchPad.recorded.should == ["message"] + end + + it 'captures sucpcessfully in a singleton class' do + ScratchPad.record [] + + class << Object.new + raise "message" + rescue => e + ScratchPad << e.message + end + + ScratchPad.recorded.should == ["message"] + end + + it 'captures successfully at the top-level' do + ScratchPad.record [] + + require_relative 'fixtures/rescue/top_level' + + ScratchPad.recorded.should == ["message"] + end + end + it "returns value from `rescue` if an exception was raised" do begin raise diff --git a/spec/truffle/parsing/fixtures/rescue/capturing/with_attribute.yaml b/spec/truffle/parsing/fixtures/rescue/capturing/with_attribute.yaml index b093d606416f..1e2c542eee6e 100644 --- a/spec/truffle/parsing/fixtures/rescue/capturing/with_attribute.yaml +++ b/spec/truffle/parsing/fixtures/rescue/capturing/with_attribute.yaml @@ -1,6 +1,5 @@ subject: "Rescue keyword" description: "capturing / with an attribute" -yarp_specific: true # an AssignRescueVariableNode node is introduced notes: > Capturing exception to a setter is represented as a `a.foo=()` method call. @@ -16,7 +15,8 @@ notes: > ```ruby a.foo = $! ``` -yarp_specific: true # generate explicit NilLiteralNode (isImplicit = false) +yarp_specific: true # an AssignRescueVariableNode node is introduced + # generate explicit NilLiteralNode (isImplicit = false) focused_on_node: "org.truffleruby.language.exceptions.TryNode" ruby: | begin diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index fafa6102895b..44ce50437e70 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -374,12 +374,18 @@ public RubyNode visitBeginNode(Nodes.BeginNode node) { } final RubyNode splatTranslated = translateNodeOrNil(splatNode.expression); - RubyNode translatedBody = translateNodeOrNil(rescueClause.statements); + + RubyNode translatedBody; if (rescueClause.reference != null) { + // translate body after reference as far as reference could be used inside body + // and if it's a local variable - it should be declared before reading final RubyNode exceptionWriteNode = translateRescueException(rescueClause.reference); + translatedBody = translateNodeOrNil(rescueClause.statements); translatedBody = sequence(rescueClause, Arrays.asList(exceptionWriteNode, translatedBody)); + } else { + translatedBody = translateNodeOrNil(rescueClause.statements); } final RescueNode rescueNode = new RescueSplatNode(language, splatTranslated, @@ -401,11 +407,17 @@ public RubyNode visitBeginNode(Nodes.BeginNode node) { } } else { // exception class isn't specified explicitly so use Ruby StandardError class - RubyNode translatedBody = translateNodeOrNil(rescueClause.statements); + + RubyNode translatedBody; if (rescueClause.reference != null) { - final RubyNode exceptionWriteNode = translateRescueException(rescueClause.reference); + // translate body after reference as far as reference could be used inside body + // and if it's a local variable - it should be declared before reading + RubyNode exceptionWriteNode = translateRescueException(rescueClause.reference); + translatedBody = translateNodeOrNil(rescueClause.statements); translatedBody = sequence(rescueClause, Arrays.asList(exceptionWriteNode, translatedBody)); + } else { + translatedBody = translateNodeOrNil(rescueClause.statements); } final RescueStandardErrorNode rescueNode = new RescueStandardErrorNode(translatedBody); From f18caf4fbf94a163f5f860c6863c956de923d9f2 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Fri, 19 Jan 2024 13:38:22 +0200 Subject: [PATCH 052/131] Fix BEGIN blocks when -n command line option is passed --- .../truffleruby/parser/YARPTranslator.java | 16 ++++++++------- .../parser/YARPTranslatorDriver.java | 20 +++++++------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java index 44ce50437e70..238ce526e72a 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslator.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java @@ -248,6 +248,10 @@ public TranslatorEnvironment getEnvironment() { return environment; } + public ArrayList getBeginBlocks() { + return beginBlocks; + } + public RubyRootNode translate(Nodes.Node node) { var body = node.accept(this); var frameDescriptor = TranslatorEnvironment.newFrameDescriptorBuilderForMethod().build(); @@ -2734,13 +2738,11 @@ public RubyNode visitPreExecutionNode(Nodes.PreExecutionNode node) { @Override public RubyNode visitProgramNode(Nodes.ProgramNode node) { - final RubyNode sequence = node.statements.accept(this); - - // add BEGIN {} blocks at the very beginning of the program - ArrayList nodes = new ArrayList<>(beginBlocks); - nodes.add(sequence); - - return sequence(node, nodes); + // Don't prepend BEGIN blocks here because there are additional nodes prepended + // after program translation to handle Ruby's -l and -n command line options. + // So BEGIN blocks should precede these additional nodes at the very + // beginning of a program. + return node.statements.accept(this); } @Override diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java index bba398ca096f..2c656e075e7a 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java @@ -49,7 +49,6 @@ import org.truffleruby.RubyLanguage; import org.truffleruby.annotations.Split; import org.truffleruby.aot.ParserCache; -import org.truffleruby.collections.Memo; import org.truffleruby.core.CoreLibrary; import org.truffleruby.core.DummyNode; import org.truffleruby.core.binding.BindingNodes; @@ -263,7 +262,6 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, parserContext, currentNode); - final Memo beginNodeMemo = new Memo<>(null); RubyNode truffleNode; printParseTranslateExecuteMetric("before-translate", context, source); try { @@ -271,17 +269,11 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, "translating", source.getName(), () -> { - // TODO: handle BEGIN {} blocks finally - // if (node.getBeginNode() != null) { - // beginNodeMemo.set(translator.translateNodeOrNil(sourceIndexLength, node.getBeginNode())); - // } - // return translator.translateNodeOrNil(sourceIndexLength, node.getBodyNode()); return node.accept(translator); }); } finally { printParseTranslateExecuteMetric("after-translate", context, source); } - RubyNode beginNode = beginNodeMemo.get(); // Load arguments if (argumentNames != null && argumentNames.length > 0) { @@ -330,12 +322,14 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, WhileNodeFactory.WhileRepeatingNodeGen.create(new KernelGetsNode(), truffleNode)); } - if (beginNode != null) { - truffleNode = Translator.sequence( - sourceIndexLength, - Arrays.asList(beginNode, truffleNode)); - } + ArrayList beginBlocks = translator.getBeginBlocks(); + // add BEGIN {} blocks at the very beginning of the program + if (!beginBlocks.isEmpty()) { + ArrayList sequence = new ArrayList<>(beginBlocks); + sequence.add(truffleNode); + truffleNode = Translator.sequence(sourceIndexLength, sequence); + } final RubyNode writeSelfNode = Translator.loadSelf(language); truffleNode = Translator.sequence(sourceIndexLength, Arrays.asList(writeSelfNode, truffleNode)); From 72b0f521cfa057847b6b74972a61edc2e8b32f5d Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Fri, 19 Jan 2024 16:09:42 +0200 Subject: [PATCH 053/131] Fix parsing empty Ruby source file --- .../java/org/truffleruby/parser/YARPTranslatorDriver.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java index 2c656e075e7a..e9c3a88f5ba9 100644 --- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java +++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java @@ -580,6 +580,11 @@ public static Nodes.Source createYARPSource(byte[] sourceBytes, RubySource rubyS lineOffsets[line - 1] = source.getLineStartOffset(line); } + // Nodes.Source expects at least one line, but there are no any line in empty Ruby source file + if (lineOffsets.length == 0) { + lineOffsets = new int[]{ 0 }; + } + return new Nodes.Source(sourceBytes, 1, lineOffsets); } From 9a07af341b3dedafedae61d1e9280e9228783622 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Fri, 19 Jan 2024 17:38:27 +0200 Subject: [PATCH 054/131] Import ruby/prism@f1fa486bdd8297e84495c6a6bcc064d127c0d628 --- src/main/c/yarp/include/prism/ast.h | 49 +++++- src/main/c/yarp/include/prism/defines.h | 8 + src/main/c/yarp/include/prism/diagnostic.h | 1 + src/main/c/yarp/include/prism/options.h | 9 +- src/main/c/yarp/src/diagnostic.c | 1 + src/main/c/yarp/src/prettyprint.c | 22 +-- src/main/c/yarp/src/prism.c | 171 ++++++++++++++++----- src/yarp/java/org/prism/Nodes.java | 86 +++++++---- src/yarp/java/org/prism/Parser.java | 2 +- 9 files changed, 261 insertions(+), 88 deletions(-) diff --git a/src/main/c/yarp/include/prism/ast.h b/src/main/c/yarp/include/prism/ast.h index 69372a492923..d212c724b611 100644 --- a/src/main/c/yarp/include/prism/ast.h +++ b/src/main/c/yarp/include/prism/ast.h @@ -1172,16 +1172,39 @@ typedef struct pm_and_node { /** * AndNode#left + * + * Represents the left side of the expression. It can be any kind of node + * that represents a non-void expression. + * + * left and right + * ^^^^ + * + * 1 && 2 + * ^ */ struct pm_node *left; /** * AndNode#right + * + * Represents the right side of the expression. It can be any kind of + * node that represents a non-void expression. + * + * left && right + * ^^^^^ + * + * 1 and 2 + * ^ */ struct pm_node *right; /** * AndNode#operator_loc + * + * The location of the `and` keyword or the `&&` operator. + * + * left and right + * ^^^ */ pm_location_t operator_loc; } pm_and_node_t; @@ -1290,7 +1313,8 @@ typedef struct pm_assoc_node { /** * AssocNode#key * - * The key of the association. This can be any node that represents a non-void expression. + * The key of the association. This can be any node that represents a + * non-void expression. * * { a: b } * ^ @@ -4550,16 +4574,39 @@ typedef struct pm_or_node { /** * OrNode#left + * + * Represents the left side of the expression. It can be any kind of node + * that represents a non-void expression. + * + * left or right + * ^^^^ + * + * 1 || 2 + * ^ */ struct pm_node *left; /** * OrNode#right + * + * Represents the right side of the expression. It can be any kind of + * node that represents a non-void expression. + * + * left || right + * ^^^^^ + * + * 1 or 2 + * ^ */ struct pm_node *right; /** * OrNode#operator_loc + * + * The location of the `or` keyword or the `||` operator. + * + * left or right + * ^^ */ pm_location_t operator_loc; } pm_or_node_t; diff --git a/src/main/c/yarp/include/prism/defines.h b/src/main/c/yarp/include/prism/defines.h index c9715c4eb068..c9af5fa42c65 100644 --- a/src/main/c/yarp/include/prism/defines.h +++ b/src/main/c/yarp/include/prism/defines.h @@ -16,6 +16,14 @@ #include #include +/** + * We want to be able to use the PRI* macros for printing out integers, but on + * some platforms they aren't included unless this is already defined. + */ +#define __STDC_FORMAT_MACROS + +#include + /** * By default, we compile with -fvisibility=hidden. When this is enabled, we * need to mark certain functions as being publically-visible. This macro does diff --git a/src/main/c/yarp/include/prism/diagnostic.h b/src/main/c/yarp/include/prism/diagnostic.h index da430b543851..fb4110236151 100644 --- a/src/main/c/yarp/include/prism/diagnostic.h +++ b/src/main/c/yarp/include/prism/diagnostic.h @@ -167,6 +167,7 @@ typedef enum { PM_ERR_INVALID_PERCENT, PM_ERR_INVALID_TOKEN, PM_ERR_INVALID_VARIABLE_GLOBAL, + PM_ERR_IT_NOT_ALLOWED, PM_ERR_LAMBDA_OPEN, PM_ERR_LAMBDA_TERM_BRACE, PM_ERR_LAMBDA_TERM_END, diff --git a/src/main/c/yarp/include/prism/options.h b/src/main/c/yarp/include/prism/options.h index 130d635b98e5..9ec3fba51e0d 100644 --- a/src/main/c/yarp/include/prism/options.h +++ b/src/main/c/yarp/include/prism/options.h @@ -25,9 +25,9 @@ typedef struct pm_options_scope { } pm_options_scope_t; /** - * The version of prism that we should be parsing with. This is used to allow - * consumers to specify which behavior they want in case they need to parse - * exactly as a specific version of CRuby. + * The version of Ruby syntax that we should be parsing with. This is used to + * allow consumers to specify which behavior they want in case they need to + * parse in the same way as a specific version of CRuby would have. */ typedef enum { /** The current version of prism. */ @@ -64,7 +64,8 @@ typedef struct { /** * The scopes surrounding the code that is being parsed. For most parses * this will be NULL, but for evals it will be the locals that are in scope - * surrounding the eval. + * surrounding the eval. Scopes are ordered from the outermost scope to the + * innermost one. */ pm_options_scope_t *scopes; diff --git a/src/main/c/yarp/src/diagnostic.c b/src/main/c/yarp/src/diagnostic.c index c779955eb314..ed47a1cdade0 100644 --- a/src/main/c/yarp/src/diagnostic.c +++ b/src/main/c/yarp/src/diagnostic.c @@ -175,6 +175,7 @@ static const char* const diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = { [PM_ERR_INVALID_PERCENT] = "invalid `%` token", // TODO WHAT? [PM_ERR_INVALID_TOKEN] = "invalid token", // TODO WHAT? [PM_ERR_INVALID_VARIABLE_GLOBAL] = "invalid global variable", + [PM_ERR_IT_NOT_ALLOWED] = "`it` is not allowed when an ordinary parameter is defined", [PM_ERR_LAMBDA_OPEN] = "expected a `do` keyword or a `{` to open the lambda block", [PM_ERR_LAMBDA_TERM_BRACE] = "expected a lambda block beginning with `{` to end with `}`", [PM_ERR_LAMBDA_TERM_END] = "expected a lambda block beginning with `do` to end with `end`", diff --git a/src/main/c/yarp/src/prettyprint.c b/src/main/c/yarp/src/prettyprint.c index 7b4ae67db502..35a7e436f80b 100644 --- a/src/main/c/yarp/src/prettyprint.c +++ b/src/main/c/yarp/src/prettyprint.c @@ -801,7 +801,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm { pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 locals_body_index:", 28); - pm_buffer_append_format(output_buffer, " %d\n", cast->locals_body_index); + pm_buffer_append_format(output_buffer, " %" PRIu32 "\n", cast->locals_body_index); } // parameters @@ -2939,7 +2939,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm { pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 locals_body_index:", 28); - pm_buffer_append_format(output_buffer, " %d\n", cast->locals_body_index); + pm_buffer_append_format(output_buffer, " %" PRIu32 "\n", cast->locals_body_index); } // def_keyword_loc @@ -5683,7 +5683,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm { pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 locals_body_index:", 28); - pm_buffer_append_format(output_buffer, " %d\n", cast->locals_body_index); + pm_buffer_append_format(output_buffer, " %" PRIu32 "\n", cast->locals_body_index); } // operator_loc @@ -5814,7 +5814,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm { pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_append_string(output_buffer, "\xe2\x94\x94\xe2\x94\x80\xe2\x94\x80 depth:", 16); - pm_buffer_append_format(output_buffer, " %d\n", cast->depth); + pm_buffer_append_format(output_buffer, " %" PRIu32 "\n", cast->depth); } break; @@ -5884,7 +5884,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm { pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_append_string(output_buffer, "\xe2\x94\x94\xe2\x94\x80\xe2\x94\x80 depth:", 16); - pm_buffer_append_format(output_buffer, " %d\n", cast->depth); + pm_buffer_append_format(output_buffer, " %" PRIu32 "\n", cast->depth); } break; @@ -5945,7 +5945,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm { pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_append_string(output_buffer, "\xe2\x94\x94\xe2\x94\x80\xe2\x94\x80 depth:", 16); - pm_buffer_append_format(output_buffer, " %d\n", cast->depth); + pm_buffer_append_format(output_buffer, " %" PRIu32 "\n", cast->depth); } break; @@ -5969,7 +5969,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm { pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_append_string(output_buffer, "\xe2\x94\x94\xe2\x94\x80\xe2\x94\x80 depth:", 16); - pm_buffer_append_format(output_buffer, " %d\n", cast->depth); + pm_buffer_append_format(output_buffer, " %" PRIu32 "\n", cast->depth); } break; @@ -5993,7 +5993,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm { pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_append_string(output_buffer, "\xe2\x94\x94\xe2\x94\x80\xe2\x94\x80 depth:", 16); - pm_buffer_append_format(output_buffer, " %d\n", cast->depth); + pm_buffer_append_format(output_buffer, " %" PRIu32 "\n", cast->depth); } break; @@ -6017,7 +6017,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm { pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 depth:", 16); - pm_buffer_append_format(output_buffer, " %d\n", cast->depth); + pm_buffer_append_format(output_buffer, " %" PRIu32 "\n", cast->depth); } // name_loc @@ -6729,7 +6729,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm { pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_append_string(output_buffer, "\xe2\x94\x94\xe2\x94\x80\xe2\x94\x80 maximum:", 18); - pm_buffer_append_format(output_buffer, " %d\n", cast->maximum); + pm_buffer_append_format(output_buffer, " %" PRIu8 "\n", cast->maximum); } break; @@ -6744,7 +6744,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm { pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_append_string(output_buffer, "\xe2\x94\x94\xe2\x94\x80\xe2\x94\x80 number:", 17); - pm_buffer_append_format(output_buffer, " %d\n", cast->number); + pm_buffer_append_format(output_buffer, " %" PRIu32 "\n", cast->number); } break; diff --git a/src/main/c/yarp/src/prism.c b/src/main/c/yarp/src/prism.c index bbeb3cffe969..2f92cb0da9e0 100644 --- a/src/main/c/yarp/src/prism.c +++ b/src/main/c/yarp/src/prism.c @@ -996,7 +996,7 @@ static inline void * pm_alloc_node(PRISM_ATTRIBUTE_UNUSED pm_parser_t *parser, size_t size) { void *memory = calloc(1, size); if (memory == NULL) { - fprintf(stderr, "Failed to allocate %zu bytes\n", size); + fprintf(stderr, "Failed to allocate %d bytes\n", (int) size); abort(); } return memory; @@ -2203,14 +2203,10 @@ pm_index_target_node_create(pm_parser_t *parser, pm_call_node_t *target) { pm_index_target_node_t *node = PM_ALLOC_NODE(parser, pm_index_target_node_t); pm_node_flags_t flags = target->base.flags; - if (parser->version != PM_OPTIONS_VERSION_CRUBY_3_3_0) { - flags |= PM_CALL_NODE_FLAGS_ATTRIBUTE_WRITE; - } - *node = (pm_index_target_node_t) { { .type = PM_INDEX_TARGET_NODE, - .flags = flags, + .flags = flags | PM_CALL_NODE_FLAGS_ATTRIBUTE_WRITE, .location = target->base.location }, .receiver = target->receiver, @@ -4200,12 +4196,10 @@ pm_local_variable_or_write_node_create(pm_parser_t *parser, pm_node_t *target, c } /** - * Allocate a new LocalVariableReadNode node. + * Allocate a new LocalVariableReadNode node with constant_id. */ static pm_local_variable_read_node_t * -pm_local_variable_read_node_create(pm_parser_t *parser, const pm_token_t *name, uint32_t depth) { - pm_constant_id_t name_id = pm_parser_constant_id_token(parser, name); - +pm_local_variable_read_node_create_constant_id(pm_parser_t *parser, const pm_token_t *name, pm_constant_id_t name_id, uint32_t depth) { if (parser->current_param_name == name_id) { pm_parser_err_token(parser, name, PM_ERR_PARAMETER_CIRCULAR); } @@ -4224,6 +4218,15 @@ pm_local_variable_read_node_create(pm_parser_t *parser, const pm_token_t *name, return node; } +/** + * Allocate a new LocalVariableReadNode node. + */ +static pm_local_variable_read_node_t * +pm_local_variable_read_node_create(pm_parser_t *parser, const pm_token_t *name, uint32_t depth) { + pm_constant_id_t name_id = pm_parser_constant_id_token(parser, name); + return pm_local_variable_read_node_create_constant_id(parser, name, name_id, depth); +} + /** * Allocate and initialize a new LocalVariableWriteNode node. */ @@ -4249,6 +4252,57 @@ pm_local_variable_write_node_create(pm_parser_t *parser, pm_constant_id_t name, return node; } +/** + * Returns true if the given bounds comprise `it`. + */ +static inline bool +pm_token_is_it(const uint8_t *start, const uint8_t *end) { + return (end - start == 2) && (start[0] == 'i') && (start[1] == 't'); +} + +/** + * Returns true if the given node is `it` default parameter. + */ +static inline bool +pm_node_is_it(pm_parser_t *parser, pm_node_t *node) { + // Check if it's a local variable reference + if (node->type != PM_CALL_NODE) { + return false; + } + + // Check if it's a variable call + pm_call_node_t *call_node = (pm_call_node_t *) node; + if (!pm_call_node_variable_call_p(call_node)) { + return false; + } + + // Check if it's called `it` + pm_constant_id_t id = ((pm_call_node_t *)node)->name; + pm_constant_t *constant = pm_constant_pool_id_to_constant(&parser->constant_pool, id); + return pm_token_is_it(constant->start, constant->start + constant->length); +} + +/** + * Convert a `it` variable call node to a node for `it` default parameter. + */ +static pm_node_t * +pm_node_check_it(pm_parser_t *parser, pm_node_t *node) { + if ( + (parser->version != PM_OPTIONS_VERSION_CRUBY_3_3_0) && + !parser->current_scope->closed && + pm_node_is_it(parser, node) + ) { + if (parser->current_scope->explicit_params) { + pm_parser_err_previous(parser, PM_ERR_IT_NOT_ALLOWED); + } else { + pm_node_destroy(parser, node); + pm_constant_id_t name_id = pm_parser_constant_id_constant(parser, "0it", 3); + node = (pm_node_t *) pm_local_variable_read_node_create_constant_id(parser, &parser->previous, name_id, 0); + } + } + return node; +} + /** * Returns true if the given bounds comprise a numbered parameter (i.e., they * are of the form /^_\d$/). @@ -12306,9 +12360,7 @@ parse_arguments_list(pm_parser_t *parser, pm_arguments_t *arguments, bool accept arguments->block = (pm_node_t *) block; } else { if (arguments->has_forwarding) { - if (parser->version != PM_OPTIONS_VERSION_CRUBY_3_3_0) { - pm_parser_err_node(parser, (pm_node_t *) block, PM_ERR_ARGUMENT_BLOCK_FORWARDING); - } + pm_parser_err_node(parser, (pm_node_t *) block, PM_ERR_ARGUMENT_BLOCK_FORWARDING); } else { pm_parser_err_node(parser, (pm_node_t *) block, PM_ERR_ARGUMENT_BLOCK_MULTI); } @@ -13550,8 +13602,13 @@ parse_pattern_primitive(pm_parser_t *parser, pm_diagnostic_id_t diag_id) { parser_lex(parser); pm_node_t *variable = (pm_node_t *) parse_variable(parser); if (variable == NULL) { - PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->previous, PM_ERR_NO_LOCAL_VARIABLE, (int) (parser->previous.end - parser->previous.start), parser->previous.start); - variable = (pm_node_t *) pm_local_variable_read_node_create(parser, &parser->previous, 0); + if (parser->version != PM_OPTIONS_VERSION_CRUBY_3_3_0 && pm_token_is_it(parser->previous.start, parser->previous.end)) { + pm_constant_id_t name_id = pm_parser_constant_id_constant(parser, "0it", 3); + variable = (pm_node_t *) pm_local_variable_read_node_create_constant_id(parser, &parser->previous, name_id, 0); + } else { + PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->previous, PM_ERR_NO_LOCAL_VARIABLE, (int) (parser->previous.end - parser->previous.start), parser->previous.start); + variable = (pm_node_t *) pm_local_variable_read_node_create(parser, &parser->previous, 0); + } } return (pm_node_t *) pm_pinned_variable_node_create(parser, &operator, variable); @@ -14315,7 +14372,8 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b if ( match1(parser, PM_TOKEN_PARENTHESIS_LEFT) || (accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR))) || - (pm_accepts_block_stack_p(parser) && match2(parser, PM_TOKEN_KEYWORD_DO, PM_TOKEN_BRACE_LEFT)) + (pm_accepts_block_stack_p(parser) && match1(parser, PM_TOKEN_KEYWORD_DO)) || + match1(parser, PM_TOKEN_BRACE_LEFT) ) { pm_arguments_t arguments = { 0 }; parse_arguments_list(parser, &arguments, true, accepts_command_call); @@ -14439,7 +14497,8 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b // a block, so we need to check for that here. if ( (accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR))) || - (pm_accepts_block_stack_p(parser) && match2(parser, PM_TOKEN_KEYWORD_DO, PM_TOKEN_BRACE_LEFT)) + (pm_accepts_block_stack_p(parser) && match1(parser, PM_TOKEN_KEYWORD_DO)) || + match1(parser, PM_TOKEN_BRACE_LEFT) ) { pm_arguments_t arguments = { 0 }; parse_arguments_list(parser, &arguments, true, accepts_command_call); @@ -14453,6 +14512,31 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b if ((binding_power == PM_BINDING_POWER_STATEMENT) && match1(parser, PM_TOKEN_COMMA)) { node = parse_targets_validate(parser, node, PM_BINDING_POWER_INDEX); } + else { + // Check if `it` is not going to be assigned. + switch (parser->current.type) { + case PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL: + case PM_TOKEN_AMPERSAND_EQUAL: + case PM_TOKEN_CARET_EQUAL: + case PM_TOKEN_EQUAL: + case PM_TOKEN_GREATER_GREATER_EQUAL: + case PM_TOKEN_LESS_LESS_EQUAL: + case PM_TOKEN_MINUS_EQUAL: + case PM_TOKEN_PARENTHESIS_RIGHT: + case PM_TOKEN_PERCENT_EQUAL: + case PM_TOKEN_PIPE_EQUAL: + case PM_TOKEN_PIPE_PIPE_EQUAL: + case PM_TOKEN_PLUS_EQUAL: + case PM_TOKEN_SLASH_EQUAL: + case PM_TOKEN_STAR_EQUAL: + case PM_TOKEN_STAR_STAR_EQUAL: + break; + default: + // Once we know it's neither a method call nor an assignment, + // we can finally create `it` default parameter. + node = pm_node_check_it(parser, node); + } + } return node; } @@ -15060,6 +15144,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b if (match2(parser, PM_TOKEN_DOT, PM_TOKEN_COLON_COLON)) { receiver = parse_variable_call(parser); + receiver = pm_node_check_it(parser, receiver); saved_param_name = pm_parser_current_param_name_unset(parser); pm_parser_scope_push(parser, true); @@ -17715,13 +17800,13 @@ typedef struct { pm_diagnostic_t *error; /** The start line of the diagnostic message. */ - size_t line; + uint32_t line; /** The column start of the diagnostic message. */ - size_t column_start; + uint32_t column_start; /** The column end of the diagnostic message. */ - size_t column_end; + uint32_t column_end; } pm_error_t; /** The format that will be used to format the errors into the output. */ @@ -17763,8 +17848,8 @@ pm_parser_errors_format_sort(const pm_list_t *error_list, const pm_newline_list_ (index < error_list->size) && (errors[index].error != NULL) && ( - (errors[index].line < start.line) || - (errors[index].line == start.line && errors[index].column_start < start.column) + (errors[index].line < ((uint32_t) start.line)) || + (errors[index].line == ((uint32_t) start.line) && errors[index].column_start < ((uint32_t) start.column)) ) ) index++; @@ -17773,20 +17858,20 @@ pm_parser_errors_format_sort(const pm_list_t *error_list, const pm_newline_list_ memcpy(&errors[index + 1], &errors[index], sizeof(pm_error_t) * (error_list->size - index - 1)); // Finally, we'll insert the error into the array. - size_t column_end; + uint32_t column_end; if (start.line == end.line) { - column_end = end.column; + column_end = (uint32_t) end.column; } else { - column_end = newline_list->offsets[start.line + 1] - newline_list->offsets[start.line] - 1; + column_end = (uint32_t) (newline_list->offsets[start.line + 1] - newline_list->offsets[start.line] - 1); } // Ensure we have at least one column of error. - if (start.column == column_end) column_end++; + if (((uint32_t) start.column) == column_end) column_end++; errors[index] = (pm_error_t) { .error = error, - .line = start.line, - .column_start = start.column, + .line = (uint32_t) start.line, + .column_start = (uint32_t) start.column, .column_end = column_end }; } @@ -17799,14 +17884,18 @@ pm_parser_errors_format_line(const pm_parser_t *parser, const pm_newline_list_t const uint8_t *start = &parser->start[newline_list->offsets[line]]; const uint8_t *end; - if (line + 1 > newline_list->size) { + if (line + 1 >= newline_list->size) { end = parser->end; } else { end = &parser->start[newline_list->offsets[line + 1]]; } - pm_buffer_append_format(buffer, number_prefix, line + 1); + pm_buffer_append_format(buffer, number_prefix, (uint32_t) (line + 1)); pm_buffer_append_string(buffer, (const char *) start, (size_t) (end - start)); + + if (end == parser->end && end[-1] != '\n') { + pm_buffer_append_string(buffer, "\n", 1); + } } /** @@ -17831,13 +17920,13 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col if (max_line_number < 10) { if (colorize) { error_format = (pm_error_format_t) { - .number_prefix = PM_COLOR_GRAY "%1zu | " PM_COLOR_RESET, + .number_prefix = PM_COLOR_GRAY "%1" PRIu32 " | " PM_COLOR_RESET, .blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET, .divider = PM_COLOR_GRAY " ~~~~~" PM_COLOR_RESET "\n" }; } else { error_format = (pm_error_format_t) { - .number_prefix = "%1zu | ", + .number_prefix = "%1" PRIu32 " | ", .blank_prefix = " | ", .divider = " ~~~~~\n" }; @@ -17845,13 +17934,13 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col } else if (max_line_number < 100) { if (colorize) { error_format = (pm_error_format_t) { - .number_prefix = PM_COLOR_GRAY "%2zu | " PM_COLOR_RESET, + .number_prefix = PM_COLOR_GRAY "%2" PRIu32 " | " PM_COLOR_RESET, .blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET, .divider = PM_COLOR_GRAY " ~~~~~~" PM_COLOR_RESET "\n" }; } else { error_format = (pm_error_format_t) { - .number_prefix = "%2zu | ", + .number_prefix = "%2" PRIu32 " | ", .blank_prefix = " | ", .divider = " ~~~~~~\n" }; @@ -17859,13 +17948,13 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col } else if (max_line_number < 1000) { if (colorize) { error_format = (pm_error_format_t) { - .number_prefix = PM_COLOR_GRAY "%3zu | " PM_COLOR_RESET, + .number_prefix = PM_COLOR_GRAY "%3" PRIu32 " | " PM_COLOR_RESET, .blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET, .divider = PM_COLOR_GRAY " ~~~~~~~" PM_COLOR_RESET "\n" }; } else { error_format = (pm_error_format_t) { - .number_prefix = "%3zu | ", + .number_prefix = "%3" PRIu32 " | ", .blank_prefix = " | ", .divider = " ~~~~~~~\n" }; @@ -17873,13 +17962,13 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col } else if (max_line_number < 10000) { if (colorize) { error_format = (pm_error_format_t) { - .number_prefix = PM_COLOR_GRAY "%4zu | " PM_COLOR_RESET, + .number_prefix = PM_COLOR_GRAY "%4" PRIu32 " | " PM_COLOR_RESET, .blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET, .divider = PM_COLOR_GRAY " ~~~~~~~~" PM_COLOR_RESET "\n" }; } else { error_format = (pm_error_format_t) { - .number_prefix = "%4zu | ", + .number_prefix = "%4" PRIu32 " | ", .blank_prefix = " | ", .divider = " ~~~~~~~~\n" }; @@ -17887,13 +17976,13 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col } else { if (colorize) { error_format = (pm_error_format_t) { - .number_prefix = PM_COLOR_GRAY "%5zu | " PM_COLOR_RESET, + .number_prefix = PM_COLOR_GRAY "%5" PRIu32 " | " PM_COLOR_RESET, .blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET, .divider = PM_COLOR_GRAY " ~~~~~~~~" PM_COLOR_RESET "\n" }; } else { error_format = (pm_error_format_t) { - .number_prefix = "%5zu | ", + .number_prefix = "%5" PRIu32 " | ", .blank_prefix = " | ", .divider = " ~~~~~~~~\n" }; @@ -17908,7 +17997,7 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col // the source before the error to give some context. We'll be careful not to // display the same line twice in case the errors are close enough in the // source. - size_t last_line = (size_t) -1; + uint32_t last_line = (uint32_t) -1; const pm_encoding_t *encoding = parser->encoding; for (size_t index = 0; index < error_list->size; index++) { diff --git a/src/yarp/java/org/prism/Nodes.java b/src/yarp/java/org/prism/Nodes.java index c7ebd674e51c..dfb1e1cdcefe 100644 --- a/src/yarp/java/org/prism/Nodes.java +++ b/src/yarp/java/org/prism/Nodes.java @@ -1052,7 +1052,31 @@ protected String toString(String indent) { * ^^^^^^^^^^^^^^ */ public static final class AndNode extends Node { + /** + * 
+         * Represents the left side of the expression. It can be any kind of node
+         * that represents a non-void expression.
+         *
+         *     left and right
+         *     ^^^^
+         *
+         *     1 && 2
+         *     ^
+         *
+ */ public final Node left; + /** + * 
+         * Represents the right side of the expression. It can be any kind of
+         * node that represents a non-void expression.
+         *
+         *     left && right
+         *             ^^^^^
+         *
+         *     1 and 2
+         *           ^
+         *
+ */ public final Node right; public AndNode(Node left, Node right, int startOffset, int length) { @@ -1313,7 +1337,8 @@ protected String toString(String indent) { public static final class AssocNode extends Node { /** * 
-         * The key of the association. This can be any node that represents a non-void expression.
+         * The key of the association. This can be any node that represents a
+         * non-void expression.
          *
          *     { a: b }
          *       ^
@@ -1657,8 +1682,8 @@ protected String toString(String indent) {
     /**
      * Represents a block of ruby code.
      *
-     * [1, 2, 3].each { |i| puts x }
-     *                ^^^^^^^^^^^^^^
+     *     [1, 2, 3].each { |i| puts x }
+     *                    ^^^^^^^^^^^^^^
      */
     public static final class BlockNode extends Node {
         public final String[] locals;
@@ -3395,7 +3420,8 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents writing to a constant in a context that doesn't have an explicit value.
+     * Represents writing to a constant in a context that doesn't have an
+     * explicit value.
      *
      *     Foo, Bar = baz
      *     ^^^  ^^^
@@ -5511,22 +5537,6 @@ protected String toString(String indent) {
      *     ^
      */
     public static final class IntegerNode extends Node {
-        /**
-         * 
-         * Represents flag indicating the base of the integer
-         *
-         *     10    base decimal, value 10
-         *     0d10  base decimal, value 10
-         *     0b10  base binary, value 2
-         *     0o10  base octal, value 8
-         *     010   base octal, value 8
-         *     0x10  base hexidecimal, value 16
-         *
-         * A 0 prefix indicates the number has a different base.
-         * The d, b, o, and x prefixes indicate the base. If one of those
-         * four letters is omitted, the base is assumed to be octal.
-         * 

-         */
         public final short flags;
 
         public IntegerNode(short flags, int startOffset, int length) {
@@ -6312,7 +6322,8 @@ protected String toString(String indent) {
     /**
      * Represents reading a local variable. Note that this requires that a local
      * variable of the same name has already been written to in the same scope,
-     * otherwise it is parsed as a method call.
+     * otherwise it is parsed as a method call. Note that `it` default parameter
+     * has `0it` as the name of this node.
      *
      *     foo
      *     ^^^
@@ -7288,7 +7299,31 @@ protected String toString(String indent) {
      *     ^^^^^^^^^^^^^
      */
     public static final class OrNode extends Node {
+        /**
+         * 
+         * Represents the left side of the expression. It can be any kind of node
+         * that represents a non-void expression.
+         *
+         *     left or right
+         *     ^^^^
+         *
+         *     1 || 2
+         *     ^
+         * 

+         */
         public final Node left;
+        /**
+         * 
+         * Represents the right side of the expression. It can be any kind of
+         * node that represents a non-void expression.
+         *
+         *     left || right
+         *             ^^^^^
+         *
+         *     1 or 2
+         *          ^
+         * 

+         */
         public final Node right;
 
         public OrNode(Node left, Node right, int startOffset, int length) {
@@ -7730,15 +7765,6 @@ protected String toString(String indent) {
      *          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      */
     public static final class RangeNode extends Node {
-        /**
-         * 
-         * A flag indicating whether the range excludes the end value.
-         *
-         *     1..3  # includes 3
-         *
-         *     1...3 # excludes 3
-         * 

-         */
         public final short flags;
         /**
          * 
diff --git a/src/yarp/java/org/prism/Parser.java b/src/yarp/java/org/prism/Parser.java
index 3e43c7f5d9b0..ec518834814a 100644
--- a/src/yarp/java/org/prism/Parser.java
+++ b/src/yarp/java/org/prism/Parser.java
@@ -12,4 +12,4 @@ public static byte[] parseAndSerialize(byte[] source) {
         return parseAndSerialize(source, null);
     }
 
-}
\ No newline at end of file
+}

From 7c54367d6ca1fb998208b0d70920c70dc86347fc Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Fri, 19 Jan 2024 17:47:15 +0200
Subject: [PATCH 055/131] Use Ruby 3.3.0 syntax for Prism parser

---
 .../java/org/truffleruby/parser/YARPTranslatorDriver.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index e9c3a88f5ba9..118685f1388b 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -432,9 +432,9 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
         byte[] encoding = StringOperations.encodeAsciiBytes(rubySource.getEncoding().name.toString()); // encoding name is supposed to contain only ASCII characters
         boolean frozenStringLiteral = configuration.isFrozenStringLiteral();
         boolean verbose = true;
-        // Use CRuby syntax version 0 - it's the latest. We should select 3.3.0 instead.
-        // But https://github.com/ruby/prism/pull/2118#discussion_r1445987020, so latest for now.
-        byte version = (byte) 0;
+        // The vendored version of prism in CRuby 3.3.0
+        // See pm_options_version_t in c/yarp/include/prism/options.h
+        byte version = (byte) 1;
         byte[][][] scopes;
 
         if (rubySource.isEval()) {

From 3e7497f4fc08dfa844b35b219902bfc3d1a2153b Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Mon, 22 Jan 2024 14:38:54 +0200
Subject: [PATCH 056/131] Fix triggering :class TracePoint events

---
 src/main/java/org/truffleruby/parser/YARPTranslator.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index 238ce526e72a..a9d83cf19d85 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -3376,6 +3376,7 @@ private RubyNode openModule(Nodes.Node moduleNode, RubyNode defineOrGetNode, Str
     private ModuleBodyDefinition compileClassNode(Nodes.Node moduleNode, Nodes.Node bodyNode) {
         RubyNode body = translateNodeOrNil(bodyNode);
         body = new InsideModuleDefinitionNode(body);
+        assignPositionOnly(moduleNode, body); // source location is needed to trigger :class TracePoint event
 
         if (environment.getFlipFlopStates().size() > 0) {
             body = sequence(Arrays.asList(initFlipFlopStates(environment), body));

From 12aa60fe3641da7223f1486066b15673a68d16aa Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Mon, 22 Jan 2024 15:17:46 +0200
Subject: [PATCH 057/131] Temporary tag all the pattern matching specs as
 failed

---
 spec/tags/language/pattern_matching_tags.txt | 49 ++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/spec/tags/language/pattern_matching_tags.txt b/spec/tags/language/pattern_matching_tags.txt
index 5a4dce1dacfe..35ac8d92481e 100644
--- a/spec/tags/language/pattern_matching_tags.txt
+++ b/spec/tags/language/pattern_matching_tags.txt
@@ -52,3 +52,52 @@ fails:Pattern matching Hash pattern can match partially
 fails:Pattern matching Hash pattern matches {} with {}
 fails:Pattern matching refinements are used for #deconstruct
 fails:Pattern matching can be standalone assoc operator that deconstructs value and properly scopes variables
+fails:Pattern matching extends case expression with case/in construction
+fails:Pattern matching allows using then operator
+fails:Pattern matching binds variables
+fails:Pattern matching cannot mix in and when operators
+fails:Pattern matching checks patterns until the first matching
+fails:Pattern matching executes else clause if no pattern matches
+fails:Pattern matching raises NoMatchingPatternError if no pattern matches and no else clause
+fails:Pattern matching raises NoMatchingPatternError if no pattern matches and evaluates the expression only once
+fails:Pattern matching does not allow calculation or method calls in a pattern
+fails:Pattern matching evaluates the case expression once for multiple patterns, caching the result
+fails:Pattern matching find pattern captures preceding elements to the pattern
+fails:Pattern matching find pattern captures following elements to the pattern
+fails:Pattern matching find pattern can capture the entirety of the pattern
+fails:Pattern matching find pattern will match an empty Array-like structure
+fails:Pattern matching warning when regular form does not warn about pattern matching is experimental feature
+fails:Pattern matching guards supports if guard
+fails:Pattern matching guards supports unless guard
+fails:Pattern matching guards makes bound variables visible in guard
+fails:Pattern matching guards does not evaluate guard if pattern does not match
+fails:Pattern matching guards takes guards into account when there are several matching patterns
+fails:Pattern matching guards executes else clause if no guarded pattern matches
+fails:Pattern matching guards raises NoMatchingPatternError if no guarded pattern matches and no else clause
+fails:Pattern matching value pattern matches an object such that pattern === object
+fails:Pattern matching value pattern allows string literal with interpolation
+fails:Pattern matching variable pattern matches a value and binds variable name to this value
+fails:Pattern matching variable pattern makes bounded variable visible outside a case statement scope
+fails:Pattern matching variable pattern create local variables even if a pattern doesn't match
+fails:Pattern matching variable pattern allow using _ name to drop values
+fails:Pattern matching variable pattern supports using _ in a pattern several times
+fails:Pattern matching variable pattern does not support using variable name (except _) several times
+fails:Pattern matching Array pattern supports form Constant[pat, pat, ...]
+fails:Pattern matching Array pattern supports form [pat, pat, ...]
+fails:Pattern matching Array pattern supports form pat, pat, ...
+fails:Pattern matching Array pattern matches an object with #deconstruct method which returns an array and each element in array matches element in pattern
+fails:Pattern matching Array pattern calls #deconstruct even on objects that are already an array
+fails:Pattern matching Array pattern does not match object if Constant === object returns false
+fails:Pattern matching Array pattern does not match object without #deconstruct method
+fails:Pattern matching Array pattern raises TypeError if #deconstruct method does not return array
+fails:Pattern matching Array pattern does not match object if elements of array returned by #deconstruct method does not match elements in pattern
+fails:Pattern matching Array pattern binds variables
+fails:Pattern matching Array pattern supports splat operator *rest
+fails:Pattern matching Array pattern does not match partially by default
+fails:Pattern matching Array pattern does match partially from the array beginning if list + , syntax used
+fails:Pattern matching Array pattern matches [] with []
+fails:Pattern matching Array pattern matches anything with *
+fails:Pattern matching Hash pattern does not support non-symbol keys
+fails:Pattern matching Hash pattern does not support string interpolation in keys
+fails:Pattern matching Hash pattern raise SyntaxError when keys duplicate in pattern
+fails:Pattern matching refinements are used for #=== in constant pattern

From 728da832283d720a7d830b30bde3a465aa02a343 Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Mon, 22 Jan 2024 15:25:17 +0200
Subject: [PATCH 058/131] Switch the default of the --prism option to true

---
 src/main/java/org/truffleruby/options/LanguageOptions.java      | 2 +-
 src/options.yml                                                 | 2 +-
 .../java/org/truffleruby/shared/options/OptionsCatalog.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/truffleruby/options/LanguageOptions.java b/src/main/java/org/truffleruby/options/LanguageOptions.java
index fd0a0a7f302e..92cda9fa5176 100644
--- a/src/main/java/org/truffleruby/options/LanguageOptions.java
+++ b/src/main/java/org/truffleruby/options/LanguageOptions.java
@@ -129,7 +129,7 @@ public final class LanguageOptions {
     public final boolean RUN_TWICE;
     /** --experimental-engine-caching=RUN_TWICE */
     public final boolean EXPERIMENTAL_ENGINE_CACHING;
-    /** --prism=false */
+    /** --prism=true */
     public final boolean PRISM;
 
     public LanguageOptions(Env env, OptionValues options, boolean singleContext) {
diff --git a/src/options.yml b/src/options.yml
index 0049d9026219..e28ff9fe7412 100644
--- a/src/options.yml
+++ b/src/options.yml
@@ -265,4 +265,4 @@ INTERNAL: # Options for debugging the TruffleRuby implementation
     # Options for the regular expression engines
     COMPARE_REGEX_ENGINES: [compare-regex-engines, boolean, false, 'Uses both Joni and the TRegex engine and compares their results']
 
-    PRISM: [prism, boolean, false, 'Use Prism as the parser for Ruby code']
+    PRISM: [prism, boolean, true, 'Use Prism as the parser for Ruby code']
diff --git a/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java b/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
index 0b8db7833db7..de877addb447 100644
--- a/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
+++ b/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
@@ -165,7 +165,7 @@ public final class OptionsCatalog {
     public static final OptionKey RUN_TWICE_KEY = new OptionKey<>(false);
     public static final OptionKey EXPERIMENTAL_ENGINE_CACHING_KEY = new OptionKey<>(RUN_TWICE_KEY.getDefaultValue());
     public static final OptionKey COMPARE_REGEX_ENGINES_KEY = new OptionKey<>(false);
-    public static final OptionKey PRISM_KEY = new OptionKey<>(false);
+    public static final OptionKey PRISM_KEY = new OptionKey<>(true);
 
     public static final OptionDescriptor LOAD_PATHS = OptionDescriptor
             .newBuilder(LOAD_PATHS_KEY, "ruby.load-paths")

From 2bc87360d565d06951ee97e46bb021dac5bc9e31 Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Mon, 22 Jan 2024 15:52:55 +0200
Subject: [PATCH 059/131] Do not autosplat a proc that accepts a single
 positional argument and keywords

---
 CHANGELOG.md                                  |  1 +
 spec/ruby/language/block_spec.rb              | 20 +++++++++++++++++++
 spec/tags/language/block_tags.txt             |  1 -
 .../parser/YARPBlockNodeTranslator.java       |  6 ------
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33e3331d9e7e..69b5489da263 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ Compatibility:
 * Implement `Class#attached_object` method (#3039, @andrykonchin).
 * Fix `ENV#{clone,dup}` and raise `TypeError` (#3039, @andrykonchin).
 * Fix `Coverage.supported?` and raise `TypeError` if argument is not Symbol (#3039, @andrykonchin).
+* Do not autosplat a proc that accepts a single positional argument and keywords (#3039, @andrykonchin).
 
 Performance:
 
diff --git a/spec/ruby/language/block_spec.rb b/spec/ruby/language/block_spec.rb
index fc46c12682cc..578d9cb3b028 100644
--- a/spec/ruby/language/block_spec.rb
+++ b/spec/ruby/language/block_spec.rb
@@ -66,6 +66,16 @@ def m(a) yield a end
       it "does not autosplat single argument to required arguments when a keyword rest argument is present" do
         m([1, 2]) { |a, **k| [a, k] }.should == [[1, 2], {}]
       end
+
+      it "does not autosplat single argument to required arguments when keyword arguments are present" do
+        m([1, 2]) { |a, b: :b, c: :c| [a, b, c] }.should == [[1, 2], :b, :c]
+      end
+
+      it "raises error when required keyword arguments are present" do
+        -> {
+          m([1, 2]) { |a, b:, c:| [a, b, c] }
+        }.should raise_error(ArgumentError, "missing keywords: :b, :c")
+      end
     end
 
     ruby_version_is ''..."3.2" do
@@ -73,6 +83,16 @@ def m(a) yield a end
       it "autosplats single argument to required arguments when a keyword rest argument is present" do
         m([1, 2]) { |a, **k| [a, k] }.should == [1, {}]
       end
+
+      it "autosplats single argument to required arguments when optional keyword arguments are present" do
+        m([1, 2]) { |a, b: :b, c: :c| [a, b, c] }.should == [1, :b, :c]
+      end
+
+      it "raises error when required keyword arguments are present" do
+        -> {
+          m([1, 2]) { |a, b:, c:| [a, b, c] }
+        }.should raise_error(ArgumentError, "missing keywords: :b, :c")
+      end
     end
 
     it "assigns elements to mixed argument types" do
diff --git a/spec/tags/language/block_tags.txt b/spec/tags/language/block_tags.txt
index 666e8401d111..d09ded2bb3ab 100644
--- a/spec/tags/language/block_tags.txt
+++ b/spec/tags/language/block_tags.txt
@@ -1,3 +1,2 @@
 fails:Post-args with optional args with a circular argument reference raises a SyntaxError if using an existing local with the same name as the argument
 fails:Post-args with optional args with a circular argument reference raises a SyntaxError if there is an existing method with the same name as the argument
-fails:A block yielded a single Array does not autosplat single argument to required arguments when a keyword rest argument is present
diff --git a/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java
index e4364f797e24..ec8030723f7b 100644
--- a/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java
@@ -314,12 +314,6 @@ private static RubyNode composeBody(TranslatorEnvironment environment, RubyNode
     }
 
     private boolean shouldConsiderDestructuringArrayArg(Arity arity) {
-        if (arity.getRequired() == 1 && arity.getOptional() == 0 && !arity.hasRest() && arity.hasKeywordsRest()) {
-            // Special case for: proc { |a, **kw| a }.call([1, 2]) => 1
-            // Seems inconsistent: https://bugs.ruby-lang.org/issues/16166#note-14
-            return true;
-        }
-
         if (!arity.hasRest() && arity.getRequired() + arity.getOptional() <= 1) {
             // If we accept at most 0 or 1 arguments, there's never any need to destructure
             return false;

From e59e3a39cb78ae89cac0af7056d6fb3ef30dba43 Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Mon, 22 Jan 2024 17:34:18 +0200
Subject: [PATCH 060/131] Support passing anonymous * and ** parameters as
 method call arguments

---
 CHANGELOG.md                                  |  1 +
 spec/ruby/language/delegation_spec.rb         | 36 +++++++++++++++++--
 spec/ruby/language/method_spec.rb             |  1 +
 .../truffleruby/parser/YARPTranslator.java    | 36 +++++++++++++++++--
 4 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69b5489da263..1466f9bda843 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ Compatibility:
 * Fix `ENV#{clone,dup}` and raise `TypeError` (#3039, @andrykonchin).
 * Fix `Coverage.supported?` and raise `TypeError` if argument is not Symbol (#3039, @andrykonchin).
 * Do not autosplat a proc that accepts a single positional argument and keywords (#3039, @andrykonchin).
+* Support passing anonymous * and ** parameters as method call arguments (#3039, @andrykonchin).
 
 Performance:
 
diff --git a/spec/ruby/language/delegation_spec.rb b/spec/ruby/language/delegation_spec.rb
index 020787aff60d..d780506421bd 100644
--- a/spec/ruby/language/delegation_spec.rb
+++ b/spec/ruby/language/delegation_spec.rb
@@ -31,10 +31,10 @@ def delegate_block(...)
         def delegate(...)
           target ...
         end
-       RUBY
-     end
+      RUBY
+    end
 
-     a.new.delegate(1, b: 2).should == Range.new([[], {}], nil, true)
+    a.new.delegate(1, b: 2).should == Range.new([[], {}], nil, true)
   end
 end
 
@@ -61,3 +61,33 @@ def delegate_block(x, ...)
     a.new.delegate_block(0, 1, b: 2) { |x| x }.should == [{b: 2}, [1]]
   end
 end
+
+ruby_version_is "3.2" do
+  describe "delegation with def(*)" do
+    it "delegates rest" do
+      a = Class.new(DelegationSpecs::Target)
+      a.class_eval(<<-RUBY)
+      def delegate(*)
+        target(*)
+      end
+    RUBY
+
+      a.new.delegate(0, 1).should == [[0, 1], {}]
+    end
+  end
+end
+
+ruby_version_is "3.2" do
+  describe "delegation with def(**)" do
+    it "delegates kwargs" do
+      a = Class.new(DelegationSpecs::Target)
+      a.class_eval(<<-RUBY)
+      def delegate(**)
+        target(**)
+      end
+    RUBY
+
+      a.new.delegate(a: 1) { |x| x }.should == [[], {a: 1}]
+    end
+  end
+end
diff --git a/spec/ruby/language/method_spec.rb b/spec/ruby/language/method_spec.rb
index 5f42c523413f..e34ff7e1a665 100644
--- a/spec/ruby/language/method_spec.rb
+++ b/spec/ruby/language/method_spec.rb
@@ -1335,6 +1335,7 @@ def m(n) =
     end
   end
 
+  # tested more thoroughly in language/delegation_spec.rb
   context "with args forwarding" do
     evaluate <<-ruby do
         def mm(word, num:)
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index a9d83cf19d85..f121205ea5b3 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -167,6 +167,7 @@
 import java.util.Objects;
 
 import static org.truffleruby.parser.TranslatorEnvironment.DEFAULT_KEYWORD_REST_NAME;
+import static org.truffleruby.parser.TranslatorEnvironment.DEFAULT_REST_NAME;
 import static org.truffleruby.parser.TranslatorEnvironment.FORWARDED_BLOCK_NAME;
 import static org.truffleruby.parser.TranslatorEnvironment.FORWARDED_KEYWORD_REST_NAME;
 import static org.truffleruby.parser.TranslatorEnvironment.FORWARDED_REST_NAME;
@@ -1895,7 +1896,21 @@ public RubyNode visitHashNode(Nodes.HashNode node) {
                             .create(keyValues.toArray(RubyNode.EMPTY_ARRAY), language);
                     hashConcats.add(hashLiteralSoFar);
                 }
-                hashConcats.add(HashCastNodeGen.HashCastASTNodeGen.create(assocSplatNode.value.accept(this)));
+
+                final RubyNode valueNode;
+
+                if (assocSplatNode.value != null) {
+                    valueNode = assocSplatNode.value.accept(this);
+                } else {
+                    // forwarding ** in a method call, e.g.
+                    //   def foo(**)
+                    //     bar(**)
+                    //   end
+                    valueNode = environment.findLocalVarNode(DEFAULT_KEYWORD_REST_NAME, null);
+                    assert valueNode != null : "keyrest forwarding local variable should be declared";
+                }
+
+                hashConcats.add(HashCastNodeGen.HashCastASTNodeGen.create(valueNode));
                 keyValues.clear();
             } else if (pair instanceof Nodes.AssocNode assocNode) {
                 RubyNode keyNode = assocNode.key.accept(this);
@@ -3018,8 +3033,23 @@ public RubyNode visitSourceLineNode(Nodes.SourceLineNode node) {
 
     @Override
     public RubyNode visitSplatNode(Nodes.SplatNode node) {
-        final RubyNode value = translateNodeOrNil(node.expression);
-        final RubyNode rubyNode = SplatCastNodeGen.create(language, SplatCastNode.NilBehavior.CONVERT, false, value);
+        final RubyNode rubyNode;
+
+        if (node.expression != null) {
+            final RubyNode valueNode = node.expression.accept(this);
+            rubyNode = SplatCastNodeGen.create(language, SplatCastNode.NilBehavior.CONVERT, false,
+                    valueNode);
+        } else {
+            // forwarding * in a method call, e.g.
+            //   def foo(*)
+            //     bar(*)
+            //   end
+
+            // no need for SplatCastNodeGen for * because it's always an Array and cannot be reassigned
+            rubyNode = environment.findLocalVarNode(DEFAULT_REST_NAME, null);
+            assert rubyNode != null : "rest forwarding local variable should be declared";
+        }
+
         return assignPositionAndFlags(node, rubyNode);
     }
 

From 5d55cf1cee6da9d31704b8d96e17b261ba2ee179 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 23 Jan 2024 13:48:32 +0100
Subject: [PATCH 061/131] Find libyarpbindings.so for the bootstrap launcher

* And load the library when creating the first RubyContext.
---
 mx.truffleruby/mx_truffleruby.py                    |  8 +++++++-
 mx.truffleruby/suite.py                             |  3 ++-
 src/main/java/org/truffleruby/RubyLanguage.java     | 12 ++++++++++++
 .../org/truffleruby/core/thread/ThreadManager.java  |  2 +-
 .../org/truffleruby/debug/TruffleDebugNodes.java    | 11 ++---------
 .../org/truffleruby/options/LanguageOptions.java    | 13 +++++++++++++
 src/main/java/org/truffleruby/options/Options.java  |  5 -----
 .../truffleruby/parser/YARPTranslatorDriver.java    |  2 --
 src/options.yml                                     |  1 +
 9 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/mx.truffleruby/mx_truffleruby.py b/mx.truffleruby/mx_truffleruby.py
index 242bdea3dee9..a32dfd695805 100644
--- a/mx.truffleruby/mx_truffleruby.py
+++ b/mx.truffleruby/mx_truffleruby.py
@@ -107,15 +107,21 @@ def clean(self, forBuild=False):
     def contents(self, result):
         classpath_deps = [dep for dep in self.subject.buildDependencies if isinstance(dep, mx.ClasspathDependency)]
         jvm_args = [pipes.quote(arg) for arg in mx.get_runtime_jvm_args(classpath_deps)]
+
         debug_args = mx.java_debug_args()
         jvm_args.extend(debug_args)
         if debug_args:
             jvm_args.extend(['-ea', '-esa'])
+
         jvm_args.append('-Dorg.graalvm.language.ruby.home=' + root)
+
+        libyarpbindings = list(mx.project('org.truffleruby.yarp.bindings').getArchivableResults())[0][0]
+        jvm_args.append('-Dtruffleruby.libyarpbindings=' + libyarpbindings)
+
         main_class = 'org.truffleruby.launcher.RubyLauncher'
         ruby_options = [
             '--experimental-options',
-            '--building-core-cexts',
+            '--building-core-cexts', # This lets the process know it's miniruby
             '--launcher=' + result,
             '--disable-gems',
             '--disable-rubyopt',
diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
index 08e59f043ce8..268ee39aeb02 100644
--- a/mx.truffleruby/suite.py
+++ b/mx.truffleruby/suite.py
@@ -376,10 +376,11 @@
 
         "org.truffleruby.bootstrap.launcher": {
             "class": "TruffleRubyBootstrapLauncherProject",
-            "buildDependencies": [
+            "buildDependencies": [ # These are used to build the module path
                 "TRUFFLERUBY", # We need this jar to run extconf.rb
                 "TRUFFLERUBY-LAUNCHER", # We need this jar to run extconf.rb
                 "sulong:SULONG_NATIVE", # We need this jar to find the toolchain with Toolchain#getToolPath
+                "org.truffleruby.yarp.bindings", # libyarpbindings.so
             ],
             "license": ["EPL-2.0"],
         },
diff --git a/src/main/java/org/truffleruby/RubyLanguage.java b/src/main/java/org/truffleruby/RubyLanguage.java
index 2fd48202d5d9..393ced525c84 100644
--- a/src/main/java/org/truffleruby/RubyLanguage.java
+++ b/src/main/java/org/truffleruby/RubyLanguage.java
@@ -36,6 +36,7 @@
 import com.oracle.truffle.api.strings.InternalByteArray;
 import com.oracle.truffle.api.strings.TruffleString;
 import org.graalvm.options.OptionDescriptors;
+import org.prism.Parser;
 import org.truffleruby.annotations.SuppressFBWarnings;
 import org.truffleruby.builtins.PrimitiveManager;
 import org.truffleruby.cext.ValueWrapperManager;
@@ -458,6 +459,7 @@ public RubyContext createContext(Env env) {
                 this.corePath = coreLoadPath + File.separator + "core" + File.separator;
                 this.coverageManager = new CoverageManager(options, env.lookup(Instrumenter.class));
                 primitiveManager.loadCoreMethodNodes(this.options);
+                loadLibYARPBindings();
             }
         }
 
@@ -793,6 +795,16 @@ private boolean isRubyHome(TruffleFile path) {
                 lib.resolve("patches").isDirectory();
     }
 
+    private void loadLibYARPBindings() {
+        String libyarpbindings;
+        if (options.BUILDING_CORE_CEXTS) {
+            libyarpbindings = System.getProperty("truffleruby.libyarpbindings");
+        } else {
+            libyarpbindings = getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX;
+        }
+        Parser.loadLibrary(libyarpbindings);
+    }
+
     @SuppressFBWarnings("IS2_INCONSISTENT_SYNC")
     public AllocationReporter getAllocationReporter() {
         return allocationReporter;
diff --git a/src/main/java/org/truffleruby/core/thread/ThreadManager.java b/src/main/java/org/truffleruby/core/thread/ThreadManager.java
index 92af7e8bd0b9..40ac9455a54e 100644
--- a/src/main/java/org/truffleruby/core/thread/ThreadManager.java
+++ b/src/main/java/org/truffleruby/core/thread/ThreadManager.java
@@ -99,7 +99,7 @@ public ThreadManager(RubyContext context, RubyLanguage language) {
     }
 
     public void initialize() {
-        useLibRubySignal = context.getOptions().NATIVE_PLATFORM && !context.getOptions().BUILDING_CORE_CEXTS &&
+        useLibRubySignal = context.getOptions().NATIVE_PLATFORM && !language.options.BUILDING_CORE_CEXTS &&
                 language.getRubyHome() != null;
         nativeInterrupt = context.getOptions().NATIVE_INTERRUPT && useLibRubySignal;
         if (useLibRubySignal) {
diff --git a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java
index 8bdd88b31bc0..b31c8ea8c923 100644
--- a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java
+++ b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java
@@ -118,7 +118,6 @@
 import org.truffleruby.parser.scope.StaticScope;
 import org.prism.Loader;
 import org.prism.Parser;
-import org.truffleruby.shared.Platform;
 
 @CoreModule("Truffle::Debug")
 public abstract class TruffleDebugNodes {
@@ -255,12 +254,6 @@ Object printBacktrace() {
 
     }
 
-    private static byte[] yarpSerialize(RubyLanguage language, byte[] source) {
-        // TODO: load it once during context initialization (when YARP is used as the main parser)
-        Parser.loadLibrary(language.getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX);
-        return Parser.parseAndSerialize(source);
-    }
-
     @CoreMethod(names = "yarp_serialize", onSingleton = true, required = 1)
     public abstract static class YARPSerializeNode extends CoreMethodArrayArgumentsNode {
         @TruffleBoundary
@@ -273,7 +266,7 @@ Object serialize(Object code,
             var tencoding = strings.getTEncoding(code);
             var source = copyToByteArrayNode.execute(tstring, tencoding);
 
-            byte[] serialized = yarpSerialize(getLanguage(), source);
+            byte[] serialized = Parser.parseAndSerialize(source);
 
             return createString(fromByteArrayNode, serialized, Encodings.BINARY);
         }
@@ -291,7 +284,7 @@ Object parse(Object code,
             var tencoding = strings.getTEncoding(code);
             var source = copyToByteArrayNode.execute(tstring, tencoding);
 
-            byte[] serialized = yarpSerialize(getLanguage(), source);
+            byte[] serialized = Parser.parseAndSerialize(source);
 
             var yarpSource = YARPTranslatorDriver.createYARPSource(source, YARPTranslatorDriver.createRubySource(code));
             var parseResult = Loader.load(serialized, yarpSource);
diff --git a/src/main/java/org/truffleruby/options/LanguageOptions.java b/src/main/java/org/truffleruby/options/LanguageOptions.java
index 92cda9fa5176..122facb60c1c 100644
--- a/src/main/java/org/truffleruby/options/LanguageOptions.java
+++ b/src/main/java/org/truffleruby/options/LanguageOptions.java
@@ -45,6 +45,8 @@ public final class LanguageOptions {
     public final boolean BACKTRACES_OMIT_UNUSED;
     /** --buckets-big-hash=false */
     public final boolean BIG_HASH_STRATEGY_IS_BUCKETS;
+    /** --building-core-cexts=false */
+    public final boolean BUILDING_CORE_CEXTS;
     /** --lazy-translation-log=false */
     public final boolean LAZY_TRANSLATION_LOG;
     /** --constant-dynamic-lookup-log=false */
@@ -144,6 +146,7 @@ public LanguageOptions(Env env, OptionValues options, boolean singleContext) {
         LAZY_TRANSLATION_USER = options.hasBeenSet(OptionsCatalog.LAZY_TRANSLATION_USER_KEY) ? options.get(OptionsCatalog.LAZY_TRANSLATION_USER_KEY) : LAZY_CALLTARGETS;
         BACKTRACES_OMIT_UNUSED = options.get(OptionsCatalog.BACKTRACES_OMIT_UNUSED_KEY);
         BIG_HASH_STRATEGY_IS_BUCKETS = options.get(OptionsCatalog.BIG_HASH_STRATEGY_IS_BUCKETS_KEY);
+        BUILDING_CORE_CEXTS = options.get(OptionsCatalog.BUILDING_CORE_CEXTS_KEY);
         LAZY_TRANSLATION_LOG = options.get(OptionsCatalog.LAZY_TRANSLATION_LOG_KEY);
         LOG_DYNAMIC_CONSTANT_LOOKUP = options.get(OptionsCatalog.LOG_DYNAMIC_CONSTANT_LOOKUP_KEY);
         LAZY_BUILTINS = options.hasBeenSet(OptionsCatalog.LAZY_BUILTINS_KEY) ? options.get(OptionsCatalog.LAZY_BUILTINS_KEY) : LAZY_CALLTARGETS;
@@ -213,6 +216,8 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
                 return BACKTRACES_OMIT_UNUSED;
             case "ruby.buckets-big-hash":
                 return BIG_HASH_STRATEGY_IS_BUCKETS;
+            case "ruby.building-core-cexts":
+                return BUILDING_CORE_CEXTS;
             case "ruby.lazy-translation-log":
                 return LAZY_TRANSLATION_LOG;
             case "ruby.constant-dynamic-lookup-log":
@@ -316,6 +321,7 @@ public static boolean areOptionsCompatible(OptionValues one, OptionValues two) {
                one.get(OptionsCatalog.LAZY_TRANSLATION_USER_KEY).equals(two.get(OptionsCatalog.LAZY_TRANSLATION_USER_KEY)) &&
                one.get(OptionsCatalog.BACKTRACES_OMIT_UNUSED_KEY).equals(two.get(OptionsCatalog.BACKTRACES_OMIT_UNUSED_KEY)) &&
                one.get(OptionsCatalog.BIG_HASH_STRATEGY_IS_BUCKETS_KEY).equals(two.get(OptionsCatalog.BIG_HASH_STRATEGY_IS_BUCKETS_KEY)) &&
+               one.get(OptionsCatalog.BUILDING_CORE_CEXTS_KEY).equals(two.get(OptionsCatalog.BUILDING_CORE_CEXTS_KEY)) &&
                one.get(OptionsCatalog.LAZY_TRANSLATION_LOG_KEY).equals(two.get(OptionsCatalog.LAZY_TRANSLATION_LOG_KEY)) &&
                one.get(OptionsCatalog.LOG_DYNAMIC_CONSTANT_LOOKUP_KEY).equals(two.get(OptionsCatalog.LOG_DYNAMIC_CONSTANT_LOOKUP_KEY)) &&
                one.get(OptionsCatalog.LAZY_BUILTINS_KEY).equals(two.get(OptionsCatalog.LAZY_BUILTINS_KEY)) &&
@@ -442,6 +448,13 @@ public static boolean areOptionsCompatibleOrLog(TruffleLogger logger, LanguageOp
             return false;
         }
 
+        oldValue = oldOptions.BUILDING_CORE_CEXTS;
+        newValue = newOptions.BUILDING_CORE_CEXTS;
+        if (!newValue.equals(oldValue)) {
+            logger.fine("not reusing pre-initialized context: --building-core-cexts differs, was: " + oldValue + " and is now: " + newValue);
+            return false;
+        }
+
         oldValue = oldOptions.LAZY_TRANSLATION_LOG;
         newValue = newOptions.LAZY_TRANSLATION_LOG;
         if (!newValue.equals(oldValue)) {
diff --git a/src/main/java/org/truffleruby/options/Options.java b/src/main/java/org/truffleruby/options/Options.java
index c6a118f48db2..514867c424d6 100644
--- a/src/main/java/org/truffleruby/options/Options.java
+++ b/src/main/java/org/truffleruby/options/Options.java
@@ -155,8 +155,6 @@ public final class Options {
     public final String[] ARGV_GLOBAL_VALUES;
     /** --argv-global-flags=StringArrayOptionType.EMPTY_STRING_ARRAY */
     public final String[] ARGV_GLOBAL_FLAGS;
-    /** --building-core-cexts=false */
-    public final boolean BUILDING_CORE_CEXTS;
     /** --log-pending-interrupts=false */
     public final boolean LOG_PENDING_INTERRUPTS;
     /** --print-interned-tstring-stats=false */
@@ -276,7 +274,6 @@ public Options(Env env, OptionValues options, LanguageOptions languageOptions) {
         SYNTAX_CHECK = options.get(OptionsCatalog.SYNTAX_CHECK_KEY);
         ARGV_GLOBAL_VALUES = options.get(OptionsCatalog.ARGV_GLOBAL_VALUES_KEY);
         ARGV_GLOBAL_FLAGS = options.get(OptionsCatalog.ARGV_GLOBAL_FLAGS_KEY);
-        BUILDING_CORE_CEXTS = options.get(OptionsCatalog.BUILDING_CORE_CEXTS_KEY);
         LOG_PENDING_INTERRUPTS = options.get(OptionsCatalog.LOG_PENDING_INTERRUPTS_KEY);
         PRINT_INTERNED_TSTRING_STATS = options.get(OptionsCatalog.PRINT_INTERNED_TSTRING_STATS_KEY);
         CEXTS_TO_NATIVE_STATS = options.get(OptionsCatalog.CEXTS_TO_NATIVE_STATS_KEY);
@@ -437,8 +434,6 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
                 return ARGV_GLOBAL_VALUES;
             case "ruby.argv-global-flags":
                 return ARGV_GLOBAL_FLAGS;
-            case "ruby.building-core-cexts":
-                return BUILDING_CORE_CEXTS;
             case "ruby.log-pending-interrupts":
                 return LOG_PENDING_INTERRUPTS;
             case "ruby.print-interned-tstring-stats":
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index 118685f1388b..652505621a79 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -84,7 +84,6 @@
 import org.truffleruby.parser.lexer.RubyLexer;
 import org.truffleruby.parser.parser.ParserConfiguration;
 import org.truffleruby.parser.scope.StaticScope;
-import org.truffleruby.shared.Platform;
 import org.truffleruby.shared.Metrics;
 import org.prism.Loader;
 import org.prism.Nodes;
@@ -425,7 +424,6 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
 
         // YARP begin
         byte[] sourceBytes = rubySource.getBytes();
-        org.prism.Parser.loadLibrary(language.getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX);
 
         byte[] filepath;
         int line = rubySource.getLineOffset() + 1;
diff --git a/src/options.yml b/src/options.yml
index e28ff9fe7412..9f3db237ecdb 100644
--- a/src/options.yml
+++ b/src/options.yml
@@ -54,6 +54,7 @@ LANGUAGE_OPTIONS:
 - CHECK_CLONE_UNINITIALIZED_CORRECTNESS
 - ALWAYS_CLONE_ALL
 - PRISM
+- BUILDING_CORE_CEXTS
 
 USER:
   STABLE:

From 0fbd659e2c0b60928de9fca586b88eff1ca37feb Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 23 Jan 2024 14:10:49 +0100
Subject: [PATCH 062/131] Fix RubyDebugTest

---
 .../language/RubyInlineParsingRequestNode.java            | 2 +-
 .../java/org/truffleruby/parser/YARPTranslatorDriver.java | 2 ++
 .../java/org/truffleruby/test/internal/RubyDebugTest.java | 8 ++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/truffleruby/language/RubyInlineParsingRequestNode.java b/src/main/java/org/truffleruby/language/RubyInlineParsingRequestNode.java
index bb38e19822d7..9cbaf04aca88 100644
--- a/src/main/java/org/truffleruby/language/RubyInlineParsingRequestNode.java
+++ b/src/main/java/org/truffleruby/language/RubyInlineParsingRequestNode.java
@@ -44,7 +44,7 @@ public RubyInlineParsingRequestNode(
         super(language);
         this.context = context;
 
-        final RubySource rubySource = new RubySource(source, language.getSourcePath(source));
+        final RubySource rubySource = new RubySource(source, language.getSourcePath(source), null, true, 0);
 
         // We use the current frame as the lexical scope to parse, but then we may run with a new frame in the future
         final TranslatorDriver translator = new TranslatorDriver(context, rubySource);
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index 652505621a79..dbe8b97ccd5a 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -111,6 +111,8 @@ public YARPTranslatorDriver(RubyContext context, RubySource rubySource) {
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode) {
+        assert rubySource.isEval() == parserContext.isEval();
+
         if (rubySource.getSource() != parseEnvironment.source) {
             throw CompilerDirectives.shouldNotReachHere("TranslatorDriver used with a different Source");
         }
diff --git a/src/test-internal/java/org/truffleruby/test/internal/RubyDebugTest.java b/src/test-internal/java/org/truffleruby/test/internal/RubyDebugTest.java
index 688f9004a6bb..71799d0db0a4 100644
--- a/src/test-internal/java/org/truffleruby/test/internal/RubyDebugTest.java
+++ b/src/test-internal/java/org/truffleruby/test/internal/RubyDebugTest.java
@@ -171,7 +171,7 @@ public void stepInStepOver() throws Throwable {
         stepInto(1);
         assertLocation(
                 14,
-                "if n <= 1",
+                "n <= 1",
                 "n",
                 "2",
                 "nMinusOne",
@@ -249,6 +249,10 @@ public void testEvalThrow() throws Throwable {
                 suspendedEvent.getTopStackFrame().eval("shortArg(90000)");
                 Assert.fail("DebugException is expected.");
             } catch (DebugException dex) {
+                if (dex.isInternalError()) {
+                    System.err.println("DebugException internal error:");
+                    dex.printStackTrace(System.err);
+                }
                 assertNull(dex.getCatchLocation());
                 Assert.assertFalse(dex.isInternalError());
                 dex.getThrowLocation();
@@ -392,7 +396,7 @@ private void assertLocation(final int line, final String code, final Object... e
             assertNotNull(suspendedEvent);
             final int currentLine = suspendedEvent.getSourceSection().getStartLine();
             assertEquals(line, currentLine);
-            final String currentCode = suspendedEvent.getSourceSection().getCharacters().toString().strip();
+            final String currentCode = suspendedEvent.getSourceSection().getCharacters().toString();
             assertEquals(code, currentCode);
             final DebugStackFrame frame = suspendedEvent.getTopStackFrame();
 

From 67278b96fea2343411d7a593e6d902cf725792c8 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 23 Jan 2024 14:28:26 +0100
Subject: [PATCH 063/131] The Ruby home needs to always exist to find
 libyarpbindings

---
 doc/user/options.md                           |  5 +-
 lib/cext/ABI_check.txt                        |  2 +-
 lib/truffle/rbconfig.rb                       |  1 -
 lib/truffle/rubygems/defaults/truffleruby.rb  |  2 +-
 spec/truffle/pre_initialization_spec.rb       |  7 --
 .../truffleruby/launcher/RubyLauncher.java    | 19 +---
 .../java/org/truffleruby/RubyContext.java     | 12 +--
 .../java/org/truffleruby/RubyLanguage.java    | 34 +++----
 .../org/truffleruby/core/CoreLibrary.java     |  2 +-
 .../core/thread/ThreadManager.java            |  3 +-
 .../language/TruffleBootNodes.java            |  6 +-
 .../language/loader/RequireNode.java          |  2 +-
 .../truffleruby/options/LanguageOptions.java  | 15 +--
 src/main/ruby/truffleruby/core/posix.rb       | 13 +--
 src/main/ruby/truffleruby/core/post.rb        | 19 ++--
 .../ruby/truffleruby/core/truffle/boot.rb     |  9 +-
 .../ruby/truffleruby/core/truffle/gem_util.rb |  2 +-
 .../ruby/truffleruby/post-boot/post-boot.rb   | 98 +++++++++----------
 src/options.yml                               |  2 -
 .../shared/options/OptionsCatalog.java        | 12 ---
 20 files changed, 98 insertions(+), 167 deletions(-)

diff --git a/doc/user/options.md b/doc/user/options.md
index 6a6ff901f4ea..8822b9743ebb 100644
--- a/doc/user/options.md
+++ b/doc/user/options.md
@@ -148,7 +148,6 @@ Other binaries, such as `irb`, `gem`, and so on, support exactly the same switch
 
 TruffleRuby needs to know where to locate files such as the standard library.
 These are stored in the TruffleRuby home directory.
-The Ruby home is always the one that the Truffle framework reports.
+The Ruby home is always either the one that the Truffle framework reports or the extracted internal resources.
 
-If the Ruby home appears not to be correct, or is unset, a warning will be given but the program will continue and you will not be able to require standard libraries.
-You can tell TruffleRuby not to try to find a home at all using the `no-home-provided` option.
+If the Ruby home appears not to be correct, or is unset, a exception will be thrown.
diff --git a/lib/cext/ABI_check.txt b/lib/cext/ABI_check.txt
index ec635144f600..f599e28b8ab0 100644
--- a/lib/cext/ABI_check.txt
+++ b/lib/cext/ABI_check.txt
@@ -1 +1 @@
-9
+10
diff --git a/lib/truffle/rbconfig.rb b/lib/truffle/rbconfig.rb
index 9b2f1c2c2036..f50ad72f05bd 100644
--- a/lib/truffle/rbconfig.rb
+++ b/lib/truffle/rbconfig.rb
@@ -38,7 +38,6 @@
 module RbConfig
 
   ruby_home = Truffle::Boot.ruby_home
-  raise 'The TruffleRuby home needs to be set to require RbConfig' unless ruby_home
   TOPDIR = ruby_home
 
   sulong = Truffle::Boot.get_option('cexts-sulong')
diff --git a/lib/truffle/rubygems/defaults/truffleruby.rb b/lib/truffle/rubygems/defaults/truffleruby.rb
index ed1ce4147f3f..679b6f92f64e 100644
--- a/lib/truffle/rubygems/defaults/truffleruby.rb
+++ b/lib/truffle/rubygems/defaults/truffleruby.rb
@@ -14,7 +14,7 @@
 module Gem
   # The path to the gems shipped with TruffleRuby
   def self.default_dir
-    @default_dir ||= "#{Truffle::Boot.ruby_home or raise 'TruffleRuby home not found'}/lib/gems"
+    @default_dir ||= "#{Truffle::Boot.ruby_home}/lib/gems"
   end
 
   # Only report the RUBY platform as supported to make sure gems precompiled for MRI are not used.
diff --git a/spec/truffle/pre_initialization_spec.rb b/spec/truffle/pre_initialization_spec.rb
index 01c797fe9c79..a888f86d68c6 100644
--- a/spec/truffle/pre_initialization_spec.rb
+++ b/spec/truffle/pre_initialization_spec.rb
@@ -42,13 +42,6 @@
       out.should include("\nfalse\n")
     end
 
-    it "is not used when the home is unset but was set at build time" do
-      code = "p [Truffle::Boot.ruby_home, Truffle::Boot.was_preinitialized?]"
-      out = ruby_exe(code, options: "--experimental-options --log.level=FINE --no-home-provided", args: "2>&1")
-      out.should include("[nil, false]\n")
-      out.should include("not reusing pre-initialized context: --no-home-provided differs, was: false and is now: true")
-    end
-
     it "is used when $VERBOSE changes" do
       code = "p [$VERBOSE, Truffle::Boot.was_preinitialized?]"
       # -w/-W in RUBYOPT overrides -w on the command-line, like in MRI,
diff --git a/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java b/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java
index 8a37fb27dbc7..c1d47be79183 100644
--- a/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java
+++ b/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java
@@ -311,17 +311,10 @@ private int runRubyMain(Context.Builder contextBuilder, CommandLineOptions confi
         if (ProcessStatus.isSignal(processStatus)) {
             int signalNumber = ProcessStatus.toSignal(processStatus);
 
-            if (rubyHome != null) {
-                LibRubySignal.loadLibrary(rubyHome, Platform.LIB_SUFFIX);
-                LibRubySignal.restoreSystemHandlerAndRaise(signalNumber);
-                // Some signals are ignored by default, such as SIGWINCH and SIGCHLD, in that exit with 1 like CRuby
-                return 1;
-            } else {
-                System.err.println("The TruffleRuby context ended with signal " + signalNumber +
-                        " but since librubysignal is not found we exit with code " + signalNumber +
-                        " instead of raising the signal");
-                return signalNumber;
-            }
+            LibRubySignal.loadLibrary(rubyHome, Platform.LIB_SUFFIX);
+            LibRubySignal.restoreSystemHandlerAndRaise(signalNumber);
+            // Some signals are ignored by default, such as SIGWINCH and SIGCHLD, in that exit with 1 like CRuby
+            return 1;
         }
 
         return processStatus;
@@ -367,9 +360,7 @@ private int runContext(Context.Builder builder, CommandLineOptions config) {
                 // currently only work with a single Context#eval.
                 Value rubyHome = context.eval(source(// language=ruby
                         "Truffle::Boot.ruby_home"));
-                if (rubyHome.isString()) {
-                    this.rubyHome = rubyHome.asString();
-                }
+                this.rubyHome = rubyHome.asString();
             }
 
             Metrics.printTime("after-run");
diff --git a/src/main/java/org/truffleruby/RubyContext.java b/src/main/java/org/truffleruby/RubyContext.java
index 54c8787262c0..b9dcdc196157 100644
--- a/src/main/java/org/truffleruby/RubyContext.java
+++ b/src/main/java/org/truffleruby/RubyContext.java
@@ -107,7 +107,6 @@ public final class RubyContext {
 
     @CompilationFinal public TruffleLogger logger;
     @CompilationFinal private Options options;
-    @CompilationFinal private boolean hadHome;
 
     private final SafepointManager safepointManager;
     private final CodeLoader codeLoader;
@@ -278,7 +277,6 @@ public void initialize() {
             // Cannot save the file descriptor in this SecureRandom in the image
             random = null;
             // Do not save image generator paths in the image heap
-            hadHome = language.getRubyHome() != null;
             featureLoader.setWorkingDirectory(null);
         } else {
             initialized = true;
@@ -296,8 +294,7 @@ protected boolean patch(Env newEnv) {
 
         final Options oldOptions = this.options;
         final Options newOptions = createOptions(newEnv, language.options);
-        final String newHome = language.getRubyHome();
-        if (!compatibleOptions(oldOptions, newOptions, this.hadHome, newHome != null)) {
+        if (!compatibleOptions(oldOptions, newOptions)) {
             return false;
         }
         this.options = newOptions;
@@ -363,14 +360,9 @@ protected boolean patchContext(Env newEnv) {
         }
     }
 
-    private boolean compatibleOptions(Options oldOptions, Options newOptions, boolean hadHome, boolean hasHome) {
+    private boolean compatibleOptions(Options oldOptions, Options newOptions) {
         final String notReusingContext = "not reusing pre-initialized context: ";
 
-        if (hadHome != hasHome) {
-            RubyLanguage.LOGGER.fine(notReusingContext + "Ruby home is " + (hasHome ? "set" : "unset"));
-            return false;
-        }
-
         // Libraries loaded during pre-initialization
 
         if (newOptions.PATCHING != oldOptions.PATCHING) {
diff --git a/src/main/java/org/truffleruby/RubyLanguage.java b/src/main/java/org/truffleruby/RubyLanguage.java
index 393ced525c84..f1e494703392 100644
--- a/src/main/java/org/truffleruby/RubyLanguage.java
+++ b/src/main/java/org/truffleruby/RubyLanguage.java
@@ -455,11 +455,11 @@ public RubyContext createContext(Env env) {
                 this.allocationReporter = env.lookup(AllocationReporter.class);
                 this.options = new LanguageOptions(env, env.getOptions(), singleContext);
                 setRubyHome(findRubyHome(env));
+                loadLibYARPBindings();
                 this.coreLoadPath = buildCoreLoadPath(this.options.CORE_LOAD_PATH);
                 this.corePath = coreLoadPath + File.separator + "core" + File.separator;
                 this.coverageManager = new CoverageManager(options, env.lookup(Instrumenter.class));
                 primitiveManager.loadCoreMethodNodes(this.options);
-                loadLibYARPBindings();
             }
         }
 
@@ -496,7 +496,7 @@ protected void initializeContext(RubyContext context) {
 
             if (context.isPreInitializing()) {
                 synchronized (this) {
-                    setRubyHome(null);
+                    resetRubyHome();
                     resetCleaner();
                 }
             }
@@ -531,6 +531,7 @@ protected boolean patchContext(RubyContext context, Env newEnv) {
 
         synchronized (this) {
             setRubyHome(findRubyHome(newEnv));
+            loadLibYARPBindings();
             setupCleaner();
         }
 
@@ -720,9 +721,8 @@ public TruffleFile getRubyHomeTruffleFile() {
     }
 
     public String getPathRelativeToHome(String path) {
-        final String home = rubyHome;
-        if (home != null && path.startsWith(home) && path.length() > home.length()) {
-            return path.substring(home.length() + 1);
+        if (path.startsWith(rubyHome) && path.length() > rubyHome.length()) {
+            return path.substring(rubyHome.length() + 1);
         } else {
             return path;
         }
@@ -731,8 +731,15 @@ public String getPathRelativeToHome(String path) {
     private void setRubyHome(TruffleFile home) {
         assert Thread.holdsLock(this);
         rubyHomeTruffleFile = home;
-        rubyHome = home == null ? null : home.getPath();
-        cextPath = home == null ? null : rubyHome + "/lib/truffle/truffle/cext_ruby.rb";
+        rubyHome = home.getPath();
+        cextPath = rubyHome + "/lib/truffle/truffle/cext_ruby.rb";
+    }
+
+    private void resetRubyHome() {
+        assert Thread.holdsLock(this);
+        rubyHomeTruffleFile = null;
+        rubyHome = null;
+        cextPath = null;
     }
 
     private TruffleFile findRubyHome(Env env) {
@@ -745,11 +752,6 @@ private TruffleFile findRubyHome(Env env) {
 
     // Returns a canonical path to the home
     private TruffleFile searchRubyHome(Env env) {
-        if (options.NO_HOME_PROVIDED) {
-            LOGGER.config("--ruby.no-home-provided set");
-            return null;
-        }
-
         final String truffleReported = getLanguageHome();
         if (truffleReported != null) {
             var truffleReportedFile = env.getInternalTruffleFile(truffleReported);
@@ -781,11 +783,9 @@ private TruffleFile searchRubyHome(Env env) {
             }
         }
 
-        LOGGER.warning(
-                String.format("Truffle-reported home %s and internal resource %s do not look like TruffleRuby's home",
-                        truffleReported, homeResource));
-        LOGGER.warning("could not determine TruffleRuby's home - the standard library will not be available");
-        return null;
+        throw new Error("Could not find TruffleRuby's home - not possible to parse Ruby code" + String.format(
+                " (Truffle-reported home %s and internal resource %s do not look like TruffleRuby's home).",
+                truffleReported, homeResource));
     }
 
     private boolean isRubyHome(TruffleFile path) {
diff --git a/src/main/java/org/truffleruby/core/CoreLibrary.java b/src/main/java/org/truffleruby/core/CoreLibrary.java
index ecf775626806..cf7a45a13ef5 100644
--- a/src/main/java/org/truffleruby/core/CoreLibrary.java
+++ b/src/main/java/org/truffleruby/core/CoreLibrary.java
@@ -563,7 +563,7 @@ private ConcurrentMap initializePatching(RubyContext context) {
         final ConcurrentMap patchFiles = new ConcurrentHashMap<>();
 
         final String rubyHome = language.getRubyHome();
-        if (context.getOptions().PATCHING && rubyHome != null) {
+        if (context.getOptions().PATCHING) {
             try {
                 final Path patchesDirectory = Paths.get(rubyHome, "lib", "patches");
                 Files.walkFileTree(
diff --git a/src/main/java/org/truffleruby/core/thread/ThreadManager.java b/src/main/java/org/truffleruby/core/thread/ThreadManager.java
index 40ac9455a54e..c5b45563dcaf 100644
--- a/src/main/java/org/truffleruby/core/thread/ThreadManager.java
+++ b/src/main/java/org/truffleruby/core/thread/ThreadManager.java
@@ -99,8 +99,7 @@ public ThreadManager(RubyContext context, RubyLanguage language) {
     }
 
     public void initialize() {
-        useLibRubySignal = context.getOptions().NATIVE_PLATFORM && !language.options.BUILDING_CORE_CEXTS &&
-                language.getRubyHome() != null;
+        useLibRubySignal = context.getOptions().NATIVE_PLATFORM && !language.options.BUILDING_CORE_CEXTS;
         nativeInterrupt = context.getOptions().NATIVE_INTERRUPT && useLibRubySignal;
         if (useLibRubySignal) {
             LibRubySignal.loadLibrary(language.getRubyHome(), Platform.LIB_SUFFIX);
diff --git a/src/main/java/org/truffleruby/language/TruffleBootNodes.java b/src/main/java/org/truffleruby/language/TruffleBootNodes.java
index cfb84d929924..ea9e22fddd47 100644
--- a/src/main/java/org/truffleruby/language/TruffleBootNodes.java
+++ b/src/main/java/org/truffleruby/language/TruffleBootNodes.java
@@ -66,11 +66,7 @@ public abstract static class RubyHomeNode extends CoreMethodNode {
         @Specialization
         Object rubyHome() {
             final String home = getLanguage().getRubyHome();
-            if (home == null) {
-                return nil;
-            } else {
-                return createString(fromJavaStringNode, home, Encodings.UTF_8);
-            }
+            return createString(fromJavaStringNode, home, Encodings.UTF_8);
         }
 
     }
diff --git a/src/main/java/org/truffleruby/language/loader/RequireNode.java b/src/main/java/org/truffleruby/language/loader/RequireNode.java
index 59e55433bffe..e121ec0ec6f0 100644
--- a/src/main/java/org/truffleruby/language/loader/RequireNode.java
+++ b/src/main/java/org/truffleruby/language/loader/RequireNode.java
@@ -316,7 +316,7 @@ private void handleCExtensionException(String feature, Exception e) {
             final String linkError = linkerException.getMessage();
             final String message;
             final String home = getLanguage().getRubyHome();
-            final String postInstallHook = (home != null ? home + "/" : "") + "lib/truffle/post_install_hook.sh";
+            final String postInstallHook = home + "/lib/truffle/post_install_hook.sh";
 
             // Mismatches between the libssl compiled against and the libssl used at runtime (typically on a different machine)
             if (feature.contains("openssl")) {
diff --git a/src/main/java/org/truffleruby/options/LanguageOptions.java b/src/main/java/org/truffleruby/options/LanguageOptions.java
index 122facb60c1c..0add35d39b6a 100644
--- a/src/main/java/org/truffleruby/options/LanguageOptions.java
+++ b/src/main/java/org/truffleruby/options/LanguageOptions.java
@@ -23,8 +23,6 @@
 // Checkstyle: stop
 public final class LanguageOptions {
 
-    /** --no-home-provided=false */
-    public final boolean NO_HOME_PROVIDED;
     /** --core-load-path="resource:/truffleruby" */
     public final String CORE_LOAD_PATH;
     /** --frozen-string-literals=false */
@@ -135,7 +133,6 @@ public final class LanguageOptions {
     public final boolean PRISM;
 
     public LanguageOptions(Env env, OptionValues options, boolean singleContext) {
-        NO_HOME_PROVIDED = options.get(OptionsCatalog.NO_HOME_PROVIDED_KEY);
         CORE_LOAD_PATH = options.get(OptionsCatalog.CORE_LOAD_PATH_KEY);
         FROZEN_STRING_LITERALS = options.get(OptionsCatalog.FROZEN_STRING_LITERALS_KEY);
         DEFAULT_LAZY = options.get(OptionsCatalog.DEFAULT_LAZY_KEY);
@@ -194,8 +191,6 @@ public LanguageOptions(Env env, OptionValues options, boolean singleContext) {
 
     public Object fromDescriptor(OptionDescriptor descriptor) {
         switch (descriptor.getName()) {
-            case "ruby.no-home-provided":
-                return NO_HOME_PROVIDED;
             case "ruby.core-load-path":
                 return CORE_LOAD_PATH;
             case "ruby.frozen-string-literals":
@@ -310,8 +305,7 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
     }
 
     public static boolean areOptionsCompatible(OptionValues one, OptionValues two) {
-        return one.get(OptionsCatalog.NO_HOME_PROVIDED_KEY).equals(two.get(OptionsCatalog.NO_HOME_PROVIDED_KEY)) &&
-               one.get(OptionsCatalog.CORE_LOAD_PATH_KEY).equals(two.get(OptionsCatalog.CORE_LOAD_PATH_KEY)) &&
+        return one.get(OptionsCatalog.CORE_LOAD_PATH_KEY).equals(two.get(OptionsCatalog.CORE_LOAD_PATH_KEY)) &&
                one.get(OptionsCatalog.FROZEN_STRING_LITERALS_KEY).equals(two.get(OptionsCatalog.FROZEN_STRING_LITERALS_KEY)) &&
                one.get(OptionsCatalog.DEFAULT_LAZY_KEY).equals(two.get(OptionsCatalog.DEFAULT_LAZY_KEY)) &&
                one.get(OptionsCatalog.LAZY_CALLTARGETS_KEY).equals(two.get(OptionsCatalog.LAZY_CALLTARGETS_KEY)) &&
@@ -371,13 +365,6 @@ public static boolean areOptionsCompatibleOrLog(TruffleLogger logger, LanguageOp
         Object oldValue;
         Object newValue;
 
-        oldValue = oldOptions.NO_HOME_PROVIDED;
-        newValue = newOptions.NO_HOME_PROVIDED;
-        if (!newValue.equals(oldValue)) {
-            logger.fine("not reusing pre-initialized context: --no-home-provided differs, was: " + oldValue + " and is now: " + newValue);
-            return false;
-        }
-
         oldValue = oldOptions.CORE_LOAD_PATH;
         newValue = newOptions.CORE_LOAD_PATH;
         if (!newValue.equals(oldValue)) {
diff --git a/src/main/ruby/truffleruby/core/posix.rb b/src/main/ruby/truffleruby/core/posix.rb
index 80f68fafa273..adf788f71132 100644
--- a/src/main/ruby/truffleruby/core/posix.rb
+++ b/src/main/ruby/truffleruby/core/posix.rb
@@ -39,16 +39,13 @@ def resolve
   end
 
   LIBTRUFFLEPOSIX = LazyLibrary.new do
-    if home = Truffle::Boot.ruby_home
-      if Truffle::Boot.get_option 'building-core-cexts'
-        libtruffleposix = "#{home}/src/main/c/truffleposix/libtruffleposix.#{Truffle::Platform::SOEXT}"
-      else
-        libtruffleposix = "#{home}/lib/cext/libtruffleposix.#{Truffle::Platform::SOEXT}"
-      end
-      Primitive.interop_eval_nfi "load '#{libtruffleposix}'"
+    home = Truffle::Boot.ruby_home
+    if Truffle::Boot.get_option 'building-core-cexts'
+      libtruffleposix = "#{home}/src/main/c/truffleposix/libtruffleposix.#{Truffle::Platform::SOEXT}"
     else
-      LIBC.resolve
+      libtruffleposix = "#{home}/lib/cext/libtruffleposix.#{Truffle::Platform::SOEXT}"
     end
+    Primitive.interop_eval_nfi "load '#{libtruffleposix}'"
   end
 
   LIBCRYPT = LazyLibrary.new do
diff --git a/src/main/ruby/truffleruby/core/post.rb b/src/main/ruby/truffleruby/core/post.rb
index f993bd7f0922..2b572f1f5fcf 100644
--- a/src/main/ruby/truffleruby/core/post.rb
+++ b/src/main/ruby/truffleruby/core/post.rb
@@ -93,18 +93,17 @@ def p(*a)
 
 yield_self do # Avoid capturing ruby_home in the at_exit and delay blocks
   ruby_home = Truffle::Boot.ruby_home
-  if ruby_home
-    # Does not exist but it's used by rubygems to determine index where to insert gem lib directories, as a result
-    # paths supplied by -I will stay before gem lib directories. See Gem.load_path_insert_index in rubygems.rb.
-    # Must be kept in sync with the value of RbConfig::CONFIG['sitelibdir'].
-    $LOAD_PATH.push "#{ruby_home}/lib/ruby/site_ruby/#{Truffle::GemUtil::ABI_VERSION}"
 
-    $LOAD_PATH.push "#{ruby_home}/lib/truffle"
-    $LOAD_PATH.push "#{ruby_home}/lib/mri"
-    $LOAD_PATH.push "#{ruby_home}/lib/json/lib"
+  # Does not exist but it's used by rubygems to determine index where to insert gem lib directories, as a result
+  # paths supplied by -I will stay before gem lib directories. See Gem.load_path_insert_index in rubygems.rb.
+  # Must be kept in sync with the value of RbConfig::CONFIG['sitelibdir'].
+  $LOAD_PATH.push "#{ruby_home}/lib/ruby/site_ruby/#{Truffle::GemUtil::ABI_VERSION}"
 
-    $LOAD_PATH.each { |p| p.instance_variable_set(:@gem_prelude_index, p) }
-  end
+  $LOAD_PATH.push "#{ruby_home}/lib/truffle"
+  $LOAD_PATH.push "#{ruby_home}/lib/mri"
+  $LOAD_PATH.push "#{ruby_home}/lib/json/lib"
+
+  $LOAD_PATH.each { |p| p.instance_variable_set(:@gem_prelude_index, p) }
 end
 
 Truffle::Boot.delay do
diff --git a/src/main/ruby/truffleruby/core/truffle/boot.rb b/src/main/ruby/truffleruby/core/truffle/boot.rb
index 9c986973c8c0..a26ed7308648 100644
--- a/src/main/ruby/truffleruby/core/truffle/boot.rb
+++ b/src/main/ruby/truffleruby/core/truffle/boot.rb
@@ -29,11 +29,10 @@ def self.check_syntax(source_or_file)
   def self.find_s_file(name)
     # Nonstandard lookup
 
-    if ruby_home = Truffle::Boot.ruby_home
-      # added to look up truffleruby own files first when it's not on PATH
-      name_in_ruby_home_bin = "#{ruby_home}/bin/#{name}"
-      return name_in_ruby_home_bin if File.exist?(name_in_ruby_home_bin)
-    end
+    ruby_home = Truffle::Boot.ruby_home
+    # added to look up truffleruby own files first when it's not on PATH
+    name_in_ruby_home_bin = "#{ruby_home}/bin/#{name}"
+    return name_in_ruby_home_bin if File.exist?(name_in_ruby_home_bin)
 
     # Standard lookups
 
diff --git a/src/main/ruby/truffleruby/core/truffle/gem_util.rb b/src/main/ruby/truffleruby/core/truffle/gem_util.rb
index c7a4392fbe10..986cefba58d5 100644
--- a/src/main/ruby/truffleruby/core/truffle/gem_util.rb
+++ b/src/main/ruby/truffleruby/core/truffle/gem_util.rb
@@ -81,7 +81,7 @@ module Truffle::GemUtil
 
   MARKER_NAME = 'truffleruby_gem_dir_marker.txt'
 
-  ABI_VERSION = -Truffle::Boot.read_abi_version if Truffle::Boot.ruby_home
+  ABI_VERSION = -Truffle::Boot.read_abi_version
 
   def self.upgraded_default_gem?(feature)
     if i = feature.index('/')
diff --git a/src/main/ruby/truffleruby/post-boot/post-boot.rb b/src/main/ruby/truffleruby/post-boot/post-boot.rb
index e045b9d9408a..58a54359c97c 100644
--- a/src/main/ruby/truffleruby/post-boot/post-boot.rb
+++ b/src/main/ruby/truffleruby/post-boot/post-boot.rb
@@ -9,60 +9,56 @@
 # GNU Lesser General Public License version 2.1.
 
 # These files are loaded during context pre-initialization to save startup time
-if Truffle::Boot.ruby_home
-  # Always provided features: ruby --disable-gems -e 'puts $"'
+# Always provided features: ruby --disable-gems -e 'puts $"'
+begin
+  require 'enumerator'
+  require 'thread'
+  require 'fiber'
+  require 'rational'
+  require 'complex'
+rescue LoadError => e
+  Truffle::Debug.log_warning "#{File.basename(__FILE__)}:#{__LINE__} #{e.message}"
+end
+
+if Truffle::Boot.get_option_or_default('did-you-mean', true)
+  # Load DidYouMean here manually, to avoid loading RubyGems eagerly
+  Truffle::Boot.print_time_metric :'before-did-you-mean'
   begin
-    require 'enumerator'
-    require 'thread'
-    require 'fiber'
-    require 'rational'
-    require 'complex'
+    gem_original_require 'did_you_mean'
   rescue LoadError => e
     Truffle::Debug.log_warning "#{File.basename(__FILE__)}:#{__LINE__} #{e.message}"
-  end
-
-  if Truffle::Boot.get_option_or_default('did-you-mean', true)
-    # Load DidYouMean here manually, to avoid loading RubyGems eagerly
-    Truffle::Boot.print_time_metric :'before-did-you-mean'
-    begin
-      gem_original_require 'did_you_mean'
-    rescue LoadError => e
-      Truffle::Debug.log_warning "#{File.basename(__FILE__)}:#{__LINE__} #{e.message}"
-    ensure
-      Truffle::Boot.print_time_metric :'after-did-you-mean'
-    end
+  ensure
+    Truffle::Boot.print_time_metric :'after-did-you-mean'
   end
 end
 
 # Post-boot patching when using context pre-initialization
 if Truffle::Boot.preinitializing?
   old_home = Truffle::Boot.ruby_home
-  if old_home
-    # We need to fix all paths which capture the image build-time home to point
-    # to the runtime home.
+  # We need to fix all paths which capture the image build-time home to point
+  # to the runtime home.
 
-    paths_starting_with_home = []
-    [$LOAD_PATH, $LOADED_FEATURES].each do |array|
-      array.each do |path|
-        if path.start_with?(old_home)
-          path.replace Truffle::Debug.flatten_string(path[old_home.size..-1])
-          paths_starting_with_home << path
-        elsif !path.include?('/')
-          # relative path for always provided features like 'ruby2_keywords.rb'
-        else
-          raise "Path #{path.inspect} in $LOAD_PATH or $LOADED_FEATURES was expected to start with #{old_home}"
-        end
+  paths_starting_with_home = []
+  [$LOAD_PATH, $LOADED_FEATURES].each do |array|
+    array.each do |path|
+      if path.start_with?(old_home)
+        path.replace Truffle::Debug.flatten_string(path[old_home.size..-1])
+        paths_starting_with_home << path
+      elsif !path.include?('/')
+        # relative path for always provided features like 'ruby2_keywords.rb'
+      else
+        raise "Path #{path.inspect} in $LOAD_PATH or $LOADED_FEATURES was expected to start with #{old_home}"
       end
     end
-    old_home = nil # Avoid capturing the old home in the blocks below
+  end
+  old_home = nil # Avoid capturing the old home in the blocks below
 
-    Truffle::FeatureLoader.clear_cache
+  Truffle::FeatureLoader.clear_cache
 
-    Truffle::Boot.delay do
-      new_home = Truffle::Boot.ruby_home
-      paths_starting_with_home.each do |path|
-        path.replace(new_home + path)
-      end
+  Truffle::Boot.delay do
+    new_home = Truffle::Boot.ruby_home
+    paths_starting_with_home.each do |path|
+      path.replace(new_home + path)
     end
   end
 end
@@ -72,20 +68,18 @@
   Dir.chdir(wd) unless wd.empty? || wd == '.'
 end
 
-if Truffle::Boot.ruby_home
-  Truffle::Boot.delay do
-    if Truffle::Boot.get_option('rubygems') and !Truffle::Boot.get_option('lazy-rubygems')
+Truffle::Boot.delay do
+  if Truffle::Boot.get_option('rubygems') and !Truffle::Boot.get_option('lazy-rubygems')
+    begin
+      Truffle::Boot.print_time_metric :'before-rubygems'
       begin
-        Truffle::Boot.print_time_metric :'before-rubygems'
-        begin
-          # Needs to happen after patching $LOAD_PATH above
-          require 'rubygems'
-        ensure
-          Truffle::Boot.print_time_metric :'after-rubygems'
-        end
-      rescue LoadError => e
-        Truffle::Debug.log_warning "#{File.basename(__FILE__)}:#{__LINE__} #{e.message}\n#{$LOAD_PATH.join "\n"}"
+        # Needs to happen after patching $LOAD_PATH above
+        require 'rubygems'
+      ensure
+        Truffle::Boot.print_time_metric :'after-rubygems'
       end
+    rescue LoadError => e
+      Truffle::Debug.log_warning "#{File.basename(__FILE__)}:#{__LINE__} #{e.message}\n#{$LOAD_PATH.join "\n"}"
     end
   end
 end
diff --git a/src/options.yml b/src/options.yml
index 9f3db237ecdb..215a5b72b36f 100644
--- a/src/options.yml
+++ b/src/options.yml
@@ -21,7 +21,6 @@ LANGUAGE_OPTIONS:
 - ARRAY_UNINITIALIZED_SIZE
 - PACK_RECOVER_LOOP_MIN
 - PACK_UNROLL_LIMIT
-- NO_HOME_PROVIDED
 - COVERAGE_GLOBAL
 - BIG_HASH_STRATEGY_IS_BUCKETS
 # Inline cache sizes
@@ -72,7 +71,6 @@ USER:
 EXPERT:
   EXPERIMENTAL:
     # Setting home and launcher, useful for embedding
-    NO_HOME_PROVIDED: [no-home-provided, boolean, false, set to true to explicitly state that no home is provided (silences the warnings)]
     LAUNCHER: [launcher, string, ['', ''], The location of the TruffleRuby launcher program]
     CORE_LOAD_PATH: [core-load-path, string, ['resource:/truffleruby', ''], Location to load the Truffle core library from]
 
diff --git a/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java b/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
index de877addb447..669f31ca1382 100644
--- a/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
+++ b/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
@@ -29,7 +29,6 @@ public final class OptionsCatalog {
     public static final OptionKey INTERNAL_ENCODING_KEY = new OptionKey<>("");
     public static final OptionKey EXTERNAL_ENCODING_KEY = new OptionKey<>("");
     public static final OptionKey BACKTRACE_LIMIT_KEY = new OptionKey<>(-1);
-    public static final OptionKey NO_HOME_PROVIDED_KEY = new OptionKey<>(false);
     public static final OptionKey LAUNCHER_KEY = new OptionKey<>("");
     public static final OptionKey CORE_LOAD_PATH_KEY = new OptionKey<>("resource:/truffleruby");
     public static final OptionKey FROZEN_STRING_LITERALS_KEY = new OptionKey<>(false);
@@ -239,14 +238,6 @@ public final class OptionsCatalog {
             .usageSyntax("-1")
             .build();
 
-    public static final OptionDescriptor NO_HOME_PROVIDED = OptionDescriptor
-            .newBuilder(NO_HOME_PROVIDED_KEY, "ruby.no-home-provided")
-            .help("set to true to explicitly state that no home is provided (silences the warnings)")
-            .category(OptionCategory.EXPERT)
-            .stability(OptionStability.EXPERIMENTAL)
-            .usageSyntax("")
-            .build();
-
     public static final OptionDescriptor LAUNCHER = OptionDescriptor
             .newBuilder(LAUNCHER_KEY, "ruby.launcher")
             .help("The location of the TruffleRuby launcher program")
@@ -1355,8 +1346,6 @@ public static OptionDescriptor fromName(String name) {
                 return EXTERNAL_ENCODING;
             case "ruby.backtrace-limit":
                 return BACKTRACE_LIMIT;
-            case "ruby.no-home-provided":
-                return NO_HOME_PROVIDED;
             case "ruby.launcher":
                 return LAUNCHER;
             case "ruby.core-load-path":
@@ -1645,7 +1634,6 @@ public static OptionDescriptor[] allDescriptors() {
             INTERNAL_ENCODING,
             EXTERNAL_ENCODING,
             BACKTRACE_LIMIT,
-            NO_HOME_PROVIDED,
             LAUNCHER,
             CORE_LOAD_PATH,
             FROZEN_STRING_LITERALS,

From f2f29c779ec45e10d24f18c185cec07c99f068bf Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 23 Jan 2024 16:44:32 +0100
Subject: [PATCH 064/131] Add missing guard for Array#* for the case of `[] *
 negative`

---
 .../truffleruby/core/array/ArrayNodes.java    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/truffleruby/core/array/ArrayNodes.java b/src/main/java/org/truffleruby/core/array/ArrayNodes.java
index ed94ccf42bc9..0acb446d7104 100644
--- a/src/main/java/org/truffleruby/core/array/ArrayNodes.java
+++ b/src/main/java/org/truffleruby/core/array/ArrayNodes.java
@@ -162,13 +162,23 @@ static RubyArray addGeneralize(RubyArray a, Object bObject,
     @ReportPolymorphism
     public abstract static class MulNode extends PrimitiveArrayArgumentsNode {
 
+        @Specialization(guards = "count < 0")
+        RubyArray mulNeg(RubyArray array, long count) {
+            throw new RaiseException(getContext(), coreExceptions().argumentError("negative argument", this));
+        }
+
         @Specialization(guards = "count == 0")
         RubyArray mulZero(RubyArray array, int count) {
             return createEmptyArray();
         }
 
+        @Specialization(guards = { "count > 0", "isEmptyArray(array)" })
+        RubyArray mulEmpty(RubyArray array, long count) {
+            return createEmptyArray();
+        }
+
         @Specialization(
-                guards = { "!isEmptyArray(array)", "count > 0" },
+                guards = { "count > 0", "!isEmptyArray(array)" },
                 limit = "storageStrategyLimit()")
         RubyArray mulOther(RubyArray array, int count,
                 @Bind("array.getStore()") Object store,
@@ -197,21 +207,11 @@ RubyArray mulOther(RubyArray array, int count,
             return createArray(newStore, newSize);
         }
 
-        @Specialization(guards = "count < 0")
-        RubyArray mulNeg(RubyArray array, long count) {
-            throw new RaiseException(getContext(), coreExceptions().argumentError("negative argument", this));
-        }
-
-        @Specialization(guards = { "!isEmptyArray(array)", "count >= 0", "!fitsInInteger(count)" })
+        @Specialization(guards = { "count > 0", "!isEmptyArray(array)", "!fitsInInteger(count)" })
         RubyArray mulLong(RubyArray array, long count) {
             throw new RaiseException(getContext(), coreExceptions().rangeError("array size too big", this));
         }
 
-        @Specialization(guards = { "isEmptyArray(array)" })
-        RubyArray mulEmpty(RubyArray array, long count) {
-            return createEmptyArray();
-        }
-
         @Specialization(guards = { "!isImplicitLong(count)" })
         Object fallback(RubyArray array, Object count) {
             return FAILURE;

From 42dd4071e60add78823e01e0c7ab18ac827d139e Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 23 Jan 2024 17:13:57 +0100
Subject: [PATCH 065/131] Deduplicate code

---
 .../java/org/truffleruby/parser/YARPTranslatorDriver.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index dbe8b97ccd5a..1942a3c586c2 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -438,10 +438,10 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
         byte[][][] scopes;
 
         if (rubySource.isEval()) {
-            filepath = rubySource.getSourcePath().getBytes(rubySource.getEncoding().jcoding.getCharset()); // encoding of the eval's String argument
+            Charset sourceCharset = rubySource.getEncoding().jcoding.getCharset();
+            filepath = rubySource.getSourcePath().getBytes(sourceCharset); // encoding of the eval's String argument
 
             int scopesCount = localVariableNames.size();
-            Charset sourceCharset = rubySource.getEncoding().jcoding.getCharset();
             scopes = new byte[scopesCount][][];
 
             for (int i = 0; i < scopesCount; i++) {

From a41a7fa78c7d48e39c8d8e775f9073d08100c58f Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 23 Jan 2024 17:14:49 +0100
Subject: [PATCH 066/131] Make all Prism warnings $VERBOSE=true warnings

* Until https://github.com/ruby/prism/issues/2082 is resolved.
---
 spec/truffle/parsing/fixtures/warnings.yaml                    | 2 +-
 src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/truffle/parsing/fixtures/warnings.yaml b/spec/truffle/parsing/fixtures/warnings.yaml
index 986ff6ede3eb..e49b7c07ca9d 100644
--- a/spec/truffle/parsing/fixtures/warnings.yaml
+++ b/spec/truffle/parsing/fixtures/warnings.yaml
@@ -15,7 +15,7 @@ ast: |
               EmitWarningsNode
                   attributes:
                       flags = 0
-                      warnings = RubyDeferredWarnings(WarningMessage(message = 'ambiguous `*` has been interpreted as an argument prefix', verbosity = NON_VERBOSE, fileName = '', lineNumber = 1))
+                      warnings = RubyDeferredWarnings(WarningMessage(message = 'ambiguous `*` has been interpreted as an argument prefix', verbosity = VERBOSE, fileName = '', lineNumber = 1))
               WriteLocalVariableNode
                   attributes:
                       flags = 0
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index 1942a3c586c2..5f11eae51858 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -481,7 +481,7 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
             SourceSection section = rubySource.getSource().createSection(location.startOffset, location.length);
             int lineNumber = RubySource.getStartLineAdjusted(context, section);
 
-            rubyWarnings.warn(filename, lineNumber, warning.message);
+            rubyWarnings.warning(filename, lineNumber, warning.message);
         }
 
         if (errors.length != 0) {

From a60d4cacdda7de4456eab122075f3835dc20f93c Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 23 Jan 2024 17:31:49 +0100
Subject: [PATCH 067/131] Add TRUFFLERUBY-RESOURCES to classpath for TCK tests

* So there is a Ruby home available.
---
 mx.truffleruby/suite.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
index 268ee39aeb02..8974c3b076c0 100644
--- a/mx.truffleruby/suite.py
+++ b/mx.truffleruby/suite.py
@@ -847,8 +847,9 @@
             "dependencies": ["org.truffleruby.tck"],
             "distDependencies": [
                 "truffle:TRUFFLE_TCK",
-               # runtime-only dependencies
+                # runtime-only dependencies
                 "TRUFFLERUBY",
+                "TRUFFLERUBY-RESOURCES",
             ],
             "description" : "Truffle TCK provider for Ruby language.",
             "license": ["EPL-2.0"],

From d156c1c816ead1104614d7b6b8ac82d1afdbf050 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 23 Jan 2024 18:27:36 +0100
Subject: [PATCH 068/131] Fix instrumentation of WriteLocalVariableNode under
 AssignRescueVariableNode

* Revealed by TCK tests failing like this:
  java.lang.IllegalStateException: WrapperNode implementation org.truffleruby.language.RubyNodeWrapper
  cannot be safely replaced in parent node class org.truffleruby.core.rescue.AssignRescueVariableNode.
---
 .../RubyContextSourceAssignableNode.java      | 32 +++++++++++++++++++
 .../language/locals/WriteLocalNode.java       |  5 ++-
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/org/truffleruby/language/RubyContextSourceAssignableNode.java

diff --git a/src/main/java/org/truffleruby/language/RubyContextSourceAssignableNode.java b/src/main/java/org/truffleruby/language/RubyContextSourceAssignableNode.java
new file mode 100644
index 000000000000..4900f7c30aef
--- /dev/null
+++ b/src/main/java/org/truffleruby/language/RubyContextSourceAssignableNode.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.language;
+
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.GenerateWrapper;
+import com.oracle.truffle.api.instrumentation.ProbeNode;
+
+import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
+import org.truffleruby.core.array.AssignableNode;
+
+@GenerateWrapper
+public abstract class RubyContextSourceAssignableNode extends RubyContextSourceNode implements AssignableNode {
+
+    @Override
+    public WrapperNode createWrapper(ProbeNode probeNode) {
+        return new RubyContextSourceAssignableNodeWrapper(this, probeNode);
+    }
+
+    // Declared abstract here so the instrumentation wrapper delegates it
+    @Override
+    public abstract Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext context);
+
+}
diff --git a/src/main/java/org/truffleruby/language/locals/WriteLocalNode.java b/src/main/java/org/truffleruby/language/locals/WriteLocalNode.java
index bb7bdb317ef7..d3a4a293e8a3 100644
--- a/src/main/java/org/truffleruby/language/locals/WriteLocalNode.java
+++ b/src/main/java/org/truffleruby/language/locals/WriteLocalNode.java
@@ -11,17 +11,16 @@
 
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
-import org.truffleruby.core.array.AssignableNode;
 import org.truffleruby.core.string.FrozenStrings;
 import org.truffleruby.debug.SingleMemberDescriptor;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyContextSourceAssignableNode;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.StandardTags.WriteVariableTag;
 import com.oracle.truffle.api.instrumentation.Tag;
 
-public abstract class WriteLocalNode extends RubyContextSourceNode implements AssignableNode {
+public abstract class WriteLocalNode extends RubyContextSourceAssignableNode {
 
     protected final int frameSlot;
 

From 3cebf71aa81addafc635e277b9cc3ca122aad3e3 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Wed, 24 Jan 2024 12:38:19 +0100
Subject: [PATCH 069/131] Add an option to instrument all isInstrumentable()
 nodes regardless of tags

* Basically the same as the TCK instrument (VerifierInstrument) but can be
  used to run any code vs only TCK code. Instrumentation is applied on the
  first execution, so very little code is instrumented during the TCK.
* This revealed several incorrect wrappers.
---
 .../java/org/truffleruby/RubyLanguage.java    | 27 ++++++++++++++++++-
 .../truffleruby/options/LanguageOptions.java  | 13 +++++++++
 src/options.yml                               |  2 ++
 .../shared/options/OptionsCatalog.java        | 12 +++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/truffleruby/RubyLanguage.java b/src/main/java/org/truffleruby/RubyLanguage.java
index f1e494703392..75bdb6974aae 100644
--- a/src/main/java/org/truffleruby/RubyLanguage.java
+++ b/src/main/java/org/truffleruby/RubyLanguage.java
@@ -26,8 +26,12 @@
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.MaterializedFrame;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.AllocationReporter;
+import com.oracle.truffle.api.instrumentation.EventContext;
+import com.oracle.truffle.api.instrumentation.ExecutionEventListener;
 import com.oracle.truffle.api.instrumentation.Instrumenter;
+import com.oracle.truffle.api.instrumentation.SourceSectionFilter;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.source.Source;
@@ -458,11 +462,16 @@ public RubyContext createContext(Env env) {
                 loadLibYARPBindings();
                 this.coreLoadPath = buildCoreLoadPath(this.options.CORE_LOAD_PATH);
                 this.corePath = coreLoadPath + File.separator + "core" + File.separator;
-                this.coverageManager = new CoverageManager(options, env.lookup(Instrumenter.class));
+                Instrumenter instrumenter = Objects.requireNonNull(env.lookup(Instrumenter.class));
+                this.coverageManager = new CoverageManager(options, instrumenter);
+                if (options.INSTRUMENT_ALL_NODES) {
+                    instrumentAllNodes(instrumenter);
+                }
                 primitiveManager.loadCoreMethodNodes(this.options);
             }
         }
 
+
         // Set rubyHomeTruffleFile every time, as pre-initialized contexts use a different FileSystem
         if (!firstContext) {
             final String oldHome = this.rubyHome;
@@ -699,6 +708,22 @@ protected Object getScope(RubyContext context) {
         return context.getTopScopeObject();
     }
 
+    private static void instrumentAllNodes(Instrumenter instrumenter) {
+        instrumenter.attachExecutionEventListener(SourceSectionFilter.ANY, new ExecutionEventListener() {
+            @Override
+            public void onEnter(EventContext context, VirtualFrame frame) {
+            }
+
+            @Override
+            public void onReturnValue(EventContext context, VirtualFrame frame, Object result) {
+            }
+
+            @Override
+            public void onReturnExceptional(EventContext context, VirtualFrame frame, Throwable exception) {
+            }
+        });
+    }
+
     private void setupCleaner() {
         assert Thread.holdsLock(this);
         if (cleaner == null) {
diff --git a/src/main/java/org/truffleruby/options/LanguageOptions.java b/src/main/java/org/truffleruby/options/LanguageOptions.java
index 0add35d39b6a..77c681fc9b69 100644
--- a/src/main/java/org/truffleruby/options/LanguageOptions.java
+++ b/src/main/java/org/truffleruby/options/LanguageOptions.java
@@ -55,6 +55,8 @@ public final class LanguageOptions {
     public final boolean LAZY_TRANSLATION_CORE;
     /** --chaos-data=false */
     public final boolean CHAOS_DATA;
+    /** --instrument-all-nodes=false */
+    public final boolean INSTRUMENT_ALL_NODES;
     /** --basic-ops-inline=true */
     public final boolean BASICOPS_INLINE;
     /** --profile-arguments=true */
@@ -149,6 +151,7 @@ public LanguageOptions(Env env, OptionValues options, boolean singleContext) {
         LAZY_BUILTINS = options.hasBeenSet(OptionsCatalog.LAZY_BUILTINS_KEY) ? options.get(OptionsCatalog.LAZY_BUILTINS_KEY) : LAZY_CALLTARGETS;
         LAZY_TRANSLATION_CORE = options.hasBeenSet(OptionsCatalog.LAZY_TRANSLATION_CORE_KEY) ? options.get(OptionsCatalog.LAZY_TRANSLATION_CORE_KEY) : LAZY_CALLTARGETS;
         CHAOS_DATA = options.get(OptionsCatalog.CHAOS_DATA_KEY);
+        INSTRUMENT_ALL_NODES = options.get(OptionsCatalog.INSTRUMENT_ALL_NODES_KEY);
         BASICOPS_INLINE = options.get(OptionsCatalog.BASICOPS_INLINE_KEY);
         PROFILE_ARGUMENTS = options.get(OptionsCatalog.PROFILE_ARGUMENTS_KEY);
         DEFAULT_CACHE = options.get(OptionsCatalog.DEFAULT_CACHE_KEY);
@@ -223,6 +226,8 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
                 return LAZY_TRANSLATION_CORE;
             case "ruby.chaos-data":
                 return CHAOS_DATA;
+            case "ruby.instrument-all-nodes":
+                return INSTRUMENT_ALL_NODES;
             case "ruby.basic-ops-inline":
                 return BASICOPS_INLINE;
             case "ruby.profile-arguments":
@@ -321,6 +326,7 @@ public static boolean areOptionsCompatible(OptionValues one, OptionValues two) {
                one.get(OptionsCatalog.LAZY_BUILTINS_KEY).equals(two.get(OptionsCatalog.LAZY_BUILTINS_KEY)) &&
                one.get(OptionsCatalog.LAZY_TRANSLATION_CORE_KEY).equals(two.get(OptionsCatalog.LAZY_TRANSLATION_CORE_KEY)) &&
                one.get(OptionsCatalog.CHAOS_DATA_KEY).equals(two.get(OptionsCatalog.CHAOS_DATA_KEY)) &&
+               one.get(OptionsCatalog.INSTRUMENT_ALL_NODES_KEY).equals(two.get(OptionsCatalog.INSTRUMENT_ALL_NODES_KEY)) &&
                one.get(OptionsCatalog.BASICOPS_INLINE_KEY).equals(two.get(OptionsCatalog.BASICOPS_INLINE_KEY)) &&
                one.get(OptionsCatalog.PROFILE_ARGUMENTS_KEY).equals(two.get(OptionsCatalog.PROFILE_ARGUMENTS_KEY)) &&
                one.get(OptionsCatalog.DEFAULT_CACHE_KEY).equals(two.get(OptionsCatalog.DEFAULT_CACHE_KEY)) &&
@@ -477,6 +483,13 @@ public static boolean areOptionsCompatibleOrLog(TruffleLogger logger, LanguageOp
             return false;
         }
 
+        oldValue = oldOptions.INSTRUMENT_ALL_NODES;
+        newValue = newOptions.INSTRUMENT_ALL_NODES;
+        if (!newValue.equals(oldValue)) {
+            logger.fine("not reusing pre-initialized context: --instrument-all-nodes differs, was: " + oldValue + " and is now: " + newValue);
+            return false;
+        }
+
         oldValue = oldOptions.BASICOPS_INLINE;
         newValue = newOptions.BASICOPS_INLINE;
         if (!newValue.equals(oldValue)) {
diff --git a/src/options.yml b/src/options.yml
index 215a5b72b36f..7c81ef1f85bb 100644
--- a/src/options.yml
+++ b/src/options.yml
@@ -54,6 +54,7 @@ LANGUAGE_OPTIONS:
 - ALWAYS_CLONE_ALL
 - PRISM
 - BUILDING_CORE_CEXTS
+- INSTRUMENT_ALL_NODES
 
 USER:
   STABLE:
@@ -186,6 +187,7 @@ INTERNAL: # Options for debugging the TruffleRuby implementation
     LAZY_BUILTINS: [lazy-builtins, boolean, LAZY_CALLTARGETS, Load builtin classes (core methods & primitives) lazily on first use]
     LAZY_TRANSLATION_CORE: [lazy-translation-core, boolean, LAZY_CALLTARGETS, Lazily translation of core source files]
     CHAOS_DATA: [chaos-data, boolean, false, Randomize data representations to stress specialization code paths]
+    INSTRUMENT_ALL_NODES: [instrument-all-nodes, boolean, false, 'Instrument all isInstrumentable() nodes, regardless of tags, to ensure instrumentation wrappers can be inserted']
 
     # Options to help debugging the implementation performance
     BASICOPS_INLINE: [basic-ops-inline, boolean, true, Inline basic operations (like Fixnum operators) in the AST without a call]
diff --git a/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java b/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
index 669f31ca1382..314b61f03cb2 100644
--- a/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
+++ b/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
@@ -108,6 +108,7 @@ public final class OptionsCatalog {
     public static final OptionKey LAZY_BUILTINS_KEY = new OptionKey<>(LAZY_CALLTARGETS_KEY.getDefaultValue());
     public static final OptionKey LAZY_TRANSLATION_CORE_KEY = new OptionKey<>(LAZY_CALLTARGETS_KEY.getDefaultValue());
     public static final OptionKey CHAOS_DATA_KEY = new OptionKey<>(false);
+    public static final OptionKey INSTRUMENT_ALL_NODES_KEY = new OptionKey<>(false);
     public static final OptionKey BASICOPS_INLINE_KEY = new OptionKey<>(true);
     public static final OptionKey BASICOPS_LOG_REWRITE_KEY = new OptionKey<>(false);
     public static final OptionKey PROFILE_ARGUMENTS_KEY = new OptionKey<>(true);
@@ -870,6 +871,14 @@ public final class OptionsCatalog {
             .usageSyntax("")
             .build();
 
+    public static final OptionDescriptor INSTRUMENT_ALL_NODES = OptionDescriptor
+            .newBuilder(INSTRUMENT_ALL_NODES_KEY, "ruby.instrument-all-nodes")
+            .help("Instrument all isInstrumentable() nodes, regardless of tags, to ensure instrumentation wrappers can be inserted")
+            .category(OptionCategory.INTERNAL)
+            .stability(OptionStability.EXPERIMENTAL)
+            .usageSyntax("")
+            .build();
+
     public static final OptionDescriptor BASICOPS_INLINE = OptionDescriptor
             .newBuilder(BASICOPS_INLINE_KEY, "ruby.basic-ops-inline")
             .help("Inline basic operations (like Fixnum operators) in the AST without a call")
@@ -1504,6 +1513,8 @@ public static OptionDescriptor fromName(String name) {
                 return LAZY_TRANSLATION_CORE;
             case "ruby.chaos-data":
                 return CHAOS_DATA;
+            case "ruby.instrument-all-nodes":
+                return INSTRUMENT_ALL_NODES;
             case "ruby.basic-ops-inline":
                 return BASICOPS_INLINE;
             case "ruby.basic-ops-log-rewrite":
@@ -1713,6 +1724,7 @@ public static OptionDescriptor[] allDescriptors() {
             LAZY_BUILTINS,
             LAZY_TRANSLATION_CORE,
             CHAOS_DATA,
+            INSTRUMENT_ALL_NODES,
             BASICOPS_INLINE,
             BASICOPS_LOG_REWRITE,
             PROFILE_ARGUMENTS,

From de0f8e8442646f16d285b17cdf2a7d0cdc781392 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Wed, 24 Jan 2024 12:56:48 +0100
Subject: [PATCH 070/131] Use RubyContextSourceAssignableNode for more nodes
 and add CheckStyle check for it

---
 src/main/.checkstyle_checks.xml                              | 5 +++++
 .../org/truffleruby/core/array/MultipleAssignmentNode.java   | 4 ++--
 .../language/RubyContextSourceAssignableNode.java            | 2 ++
 .../truffleruby/language/constants/WriteConstantNode.java    | 4 ++--
 .../language/globals/WriteGlobalVariableNode.java            | 4 ++--
 .../language/objects/WriteInstanceVariableNode.java          | 4 ++--
 .../objects/classvariables/WriteClassVariableNode.java       | 4 ++--
 7 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/.checkstyle_checks.xml b/src/main/.checkstyle_checks.xml
index 7094a130dc97..e50b3c76d6b9 100644
--- a/src/main/.checkstyle_checks.xml
+++ b/src/main/.checkstyle_checks.xml
@@ -281,6 +281,10 @@
       
       
     
+    
+      
+      
+    
     
       
       
@@ -292,6 +296,7 @@
     
 
     
+      
       
       
       
diff --git a/src/main/java/org/truffleruby/core/array/MultipleAssignmentNode.java b/src/main/java/org/truffleruby/core/array/MultipleAssignmentNode.java
index 8adb73b970cd..1f2677c0be6a 100644
--- a/src/main/java/org/truffleruby/core/array/MultipleAssignmentNode.java
+++ b/src/main/java/org/truffleruby/core/array/MultipleAssignmentNode.java
@@ -17,12 +17,12 @@
 import org.truffleruby.core.array.ArrayIndexNodes.ReadNormalizedNode;
 import org.truffleruby.core.cast.SplatCastNode;
 import org.truffleruby.core.string.FrozenStrings;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyContextSourceAssignableNode;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-public final class MultipleAssignmentNode extends RubyContextSourceNode implements AssignableNode {
+public final class MultipleAssignmentNode extends RubyContextSourceAssignableNode {
 
     @Child RubyNode rhsNode;
     @Child SplatCastNode splatCastNode;
diff --git a/src/main/java/org/truffleruby/language/RubyContextSourceAssignableNode.java b/src/main/java/org/truffleruby/language/RubyContextSourceAssignableNode.java
index 4900f7c30aef..dea940191f5d 100644
--- a/src/main/java/org/truffleruby/language/RubyContextSourceAssignableNode.java
+++ b/src/main/java/org/truffleruby/language/RubyContextSourceAssignableNode.java
@@ -17,8 +17,10 @@
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.AssignableNode;
 
+// Checkstyle: stop
 @GenerateWrapper
 public abstract class RubyContextSourceAssignableNode extends RubyContextSourceNode implements AssignableNode {
+    // Checkstyle: resume
 
     @Override
     public WrapperNode createWrapper(ProbeNode probeNode) {
diff --git a/src/main/java/org/truffleruby/language/constants/WriteConstantNode.java b/src/main/java/org/truffleruby/language/constants/WriteConstantNode.java
index 0372cc628aae..4785f6f6558a 100644
--- a/src/main/java/org/truffleruby/language/constants/WriteConstantNode.java
+++ b/src/main/java/org/truffleruby/language/constants/WriteConstantNode.java
@@ -16,7 +16,7 @@
 import org.truffleruby.core.module.RubyModule;
 import org.truffleruby.core.string.FrozenStrings;
 import org.truffleruby.language.RubyConstant;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyContextSourceAssignableNode;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.control.RaiseException;
 
@@ -25,7 +25,7 @@
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
-public final class WriteConstantNode extends RubyContextSourceNode implements AssignableNode {
+public final class WriteConstantNode extends RubyContextSourceAssignableNode {
 
     private final String name;
 
diff --git a/src/main/java/org/truffleruby/language/globals/WriteGlobalVariableNode.java b/src/main/java/org/truffleruby/language/globals/WriteGlobalVariableNode.java
index 524d2fe1164a..c0bc8aa9c7d3 100644
--- a/src/main/java/org/truffleruby/language/globals/WriteGlobalVariableNode.java
+++ b/src/main/java/org/truffleruby/language/globals/WriteGlobalVariableNode.java
@@ -17,7 +17,7 @@
 import org.truffleruby.core.array.AssignableNode;
 import org.truffleruby.core.kernel.TruffleKernelNodes.GetSpecialVariableStorage;
 import org.truffleruby.core.string.FrozenStrings;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyContextSourceAssignableNode;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.yield.CallBlockNode;
 
@@ -27,7 +27,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 @NodeChild(value = "valueNode", type = RubyNode.class)
-public abstract class WriteGlobalVariableNode extends RubyContextSourceNode implements AssignableNode {
+public abstract class WriteGlobalVariableNode extends RubyContextSourceAssignableNode {
 
     protected final String name;
     @Child LookupGlobalVariableStorageNode lookupGlobalVariableStorageNode;
diff --git a/src/main/java/org/truffleruby/language/objects/WriteInstanceVariableNode.java b/src/main/java/org/truffleruby/language/objects/WriteInstanceVariableNode.java
index ed0695ffd0ef..e75a258a105e 100644
--- a/src/main/java/org/truffleruby/language/objects/WriteInstanceVariableNode.java
+++ b/src/main/java/org/truffleruby/language/objects/WriteInstanceVariableNode.java
@@ -15,7 +15,7 @@
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.AssignableNode;
 import org.truffleruby.core.string.FrozenStrings;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyContextSourceAssignableNode;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.control.RaiseException;
@@ -24,7 +24,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import org.truffleruby.language.locals.ReadFrameSlotNode;
 
-public abstract class WriteInstanceVariableNode extends RubyContextSourceNode implements AssignableNode {
+public abstract class WriteInstanceVariableNode extends RubyContextSourceAssignableNode {
 
     private final String name;
 
diff --git a/src/main/java/org/truffleruby/language/objects/classvariables/WriteClassVariableNode.java b/src/main/java/org/truffleruby/language/objects/classvariables/WriteClassVariableNode.java
index 5e7eefb267a1..79faa0469cac 100644
--- a/src/main/java/org/truffleruby/language/objects/classvariables/WriteClassVariableNode.java
+++ b/src/main/java/org/truffleruby/language/objects/classvariables/WriteClassVariableNode.java
@@ -16,13 +16,13 @@
 import org.truffleruby.core.module.RubyModule;
 import org.truffleruby.core.string.FrozenStrings;
 import org.truffleruby.language.LexicalScope;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyContextSourceAssignableNode;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import org.truffleruby.language.control.RaiseException;
 
-public final class WriteClassVariableNode extends RubyContextSourceNode implements AssignableNode {
+public final class WriteClassVariableNode extends RubyContextSourceAssignableNode {
 
     private final String name;
     private final BranchProfile topLevelProfile = BranchProfile.create();

From 477720161c48c280debfd409c7f86db39e483c9a Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Wed, 24 Jan 2024 13:32:47 +0100
Subject: [PATCH 071/131] Fix remaining instrumentation issues revealed by
 --instrument-all-nodes

* Running $ jt test fast -- --instrument-all-nodes
---
 .../core/inlined/InlinedIndexSetNode.java     |  8 ++++
 .../core/inlined/InlinedReplaceableNode.java  |  1 -
 .../core/inlined/LambdaToProcNode.java        |  5 ++-
 .../language/RubyContextSourceNode.java       |  5 +++
 .../org/truffleruby/language/RubyNode.java    | 17 +++++---
 .../truffleruby/language/RubyRootNode.java    |  4 +-
 .../dispatch/LiteralCallAssignableNode.java   | 42 +++++++++++++++++++
 .../language/dispatch/RubyCallNode.java       |  7 ++--
 8 files changed, 76 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/org/truffleruby/language/dispatch/LiteralCallAssignableNode.java

diff --git a/src/main/java/org/truffleruby/core/inlined/InlinedIndexSetNode.java b/src/main/java/org/truffleruby/core/inlined/InlinedIndexSetNode.java
index 41a718e16461..db20984798b3 100644
--- a/src/main/java/org/truffleruby/core/inlined/InlinedIndexSetNode.java
+++ b/src/main/java/org/truffleruby/core/inlined/InlinedIndexSetNode.java
@@ -10,6 +10,7 @@
 package org.truffleruby.core.inlined;
 
 import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.instrumentation.ProbeNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import org.truffleruby.RubyLanguage;
@@ -75,6 +76,13 @@ public AssignableNode toAssignableNode() {
         return this;
     }
 
+    // Done this way because if we had a wrapper for this node then the rewrite to RubyCallNode would fail as
+    // the wrapper would have a `TernaryInlinedOperationAssignableNode delegateNode` field. Also it is easier.
+    @Override
+    public WrapperNode createWrapper(ProbeNode probeNode) {
+        return rewriteToCallNode().createWrapper(probeNode);
+    }
+
     @Override
     public AssignableNode cloneUninitializedAssignable() {
         return (AssignableNode) cloneUninitialized();
diff --git a/src/main/java/org/truffleruby/core/inlined/InlinedReplaceableNode.java b/src/main/java/org/truffleruby/core/inlined/InlinedReplaceableNode.java
index 97ea00e679ab..0dd81436d70f 100644
--- a/src/main/java/org/truffleruby/core/inlined/InlinedReplaceableNode.java
+++ b/src/main/java/org/truffleruby/core/inlined/InlinedReplaceableNode.java
@@ -42,7 +42,6 @@ protected InlinedReplaceableNode(
         this.assumptions = new Assumption[1 + assumptions.length];
         this.assumptions[0] = language.traceFuncUnusedAssumption.getAssumption();
         ArrayUtils.arraycopy(assumptions, 0, this.assumptions, 1, assumptions.length);
-
     }
 
     protected RubyCallNode rewriteToCallNode() {
diff --git a/src/main/java/org/truffleruby/core/inlined/LambdaToProcNode.java b/src/main/java/org/truffleruby/core/inlined/LambdaToProcNode.java
index 32706274aca7..ee1cc2620d18 100644
--- a/src/main/java/org/truffleruby/core/inlined/LambdaToProcNode.java
+++ b/src/main/java/org/truffleruby/core/inlined/LambdaToProcNode.java
@@ -27,7 +27,8 @@
  * proc call target is needed instead. This node is thus needed to "deoptimize" such cases. */
 public final class LambdaToProcNode extends RubyContextSourceNode {
 
-    @Child private BlockDefinitionNode blockNode;
+    /** A {@link BlockDefinitionNode}, possibly wrapped in a RubyNodeWrapper by instrumentation */
+    @Child private RubyNode blockNode;
 
     public LambdaToProcNode(BlockDefinitionNode blockNode) {
         this.blockNode = blockNode;
@@ -35,7 +36,7 @@ public LambdaToProcNode(BlockDefinitionNode blockNode) {
 
     @Override
     public RubyProc execute(VirtualFrame frame) {
-        final RubyProc block = blockNode.execute(frame);
+        final RubyProc block = (RubyProc) blockNode.execute(frame);
         assert block.type == ProcType.LAMBDA;
         return ProcOperations.createProcFromBlock(getContext(), getLanguage(), block);
     }
diff --git a/src/main/java/org/truffleruby/language/RubyContextSourceNode.java b/src/main/java/org/truffleruby/language/RubyContextSourceNode.java
index dd70069faabb..4f68b6aefb1f 100644
--- a/src/main/java/org/truffleruby/language/RubyContextSourceNode.java
+++ b/src/main/java/org/truffleruby/language/RubyContextSourceNode.java
@@ -21,6 +21,11 @@ public abstract class RubyContextSourceNode extends RubyNode {
     private int sourceLength;
     private byte flags;
 
+    @Override
+    public void doExecuteVoid(VirtualFrame frame) {
+        execute(frame);
+    }
+
     @Override
     public Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext context) {
         return RubyNode.defaultIsDefined(this);
diff --git a/src/main/java/org/truffleruby/language/RubyNode.java b/src/main/java/org/truffleruby/language/RubyNode.java
index a63717799b86..3f53a9cc5321 100644
--- a/src/main/java/org/truffleruby/language/RubyNode.java
+++ b/src/main/java/org/truffleruby/language/RubyNode.java
@@ -58,11 +58,10 @@ public abstract class RubyNode extends RubyBaseNodeWithExecute implements Instru
 
     protected static final int NO_SOURCE = -1;
 
-    /** This method does not start with "execute" on purpose, so the Truffle DSL does not generate useless copies of
-     * this method which would increase the number of runtime compilable methods. */
-    public void doExecuteVoid(VirtualFrame frame) {
-        execute(frame);
-    }
+    /* This method does not start with "execute" on purpose, so the Truffle DSL does not generate useless copies of this
+     * method which would increase the number of runtime compilable methods. */
+    // Declared abstract here so the instrumentation wrapper delegates it
+    public abstract void doExecuteVoid(VirtualFrame frame);
 
     // Declared abstract here so the instrumentation wrapper delegates it
     public abstract Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext context);
@@ -252,6 +251,14 @@ public WrapperNode createWrapper(ProbeNode probe) {
         return new RubyNodeWrapper(this, probe);
     }
 
+    public static RubyNode unwrapNode(RubyNode node) {
+        if (node instanceof WrapperNode wrapperNode) {
+            return (RubyNode) wrapperNode.getDelegateNode();
+        } else {
+            return node;
+        }
+    }
+
     /** Return whether nodes following this one can ever be executed. In most cases this will be true, but some nodes
      * such as those representing a return or other control flow may wish to override this. */
     public boolean isContinuable() {
diff --git a/src/main/java/org/truffleruby/language/RubyRootNode.java b/src/main/java/org/truffleruby/language/RubyRootNode.java
index 094d389e7ba3..19c853207f53 100644
--- a/src/main/java/org/truffleruby/language/RubyRootNode.java
+++ b/src/main/java/org/truffleruby/language/RubyRootNode.java
@@ -234,8 +234,8 @@ private void ensureClonedCorrectly(Node original, Node clone, IdentityHashMap
Date: Wed, 24 Jan 2024 15:17:04 +0100
Subject: [PATCH 072/131] Add spec for `defined?(a[0] = 1)`

---
 spec/ruby/language/defined_spec.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spec/ruby/language/defined_spec.rb b/spec/ruby/language/defined_spec.rb
index e1680ca5bbd4..34408c019018 100644
--- a/spec/ruby/language/defined_spec.rb
+++ b/spec/ruby/language/defined_spec.rb
@@ -116,6 +116,11 @@
       defined?(obj.a_defined_method).should == "method"
     end
 
+    it "returns 'method' for []=" do
+      a = []
+      defined?(a[0] = 1).should == "method"
+    end
+
     it "returns nil if the method is not defined" do
       obj = DefinedSpecs::Basic.new
       defined?(obj.an_undefined_method).should be_nil

From 521c6095cfaea35a067b55dcdec980906b828425 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Wed, 24 Jan 2024 16:37:10 +0100
Subject: [PATCH 073/131] Add CI check for `jt test fast --
 --instrument-all-nodes`

---
 test/truffle/integration/intrument-all-nodes.sh | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100755 test/truffle/integration/intrument-all-nodes.sh

diff --git a/test/truffle/integration/intrument-all-nodes.sh b/test/truffle/integration/intrument-all-nodes.sh
new file mode 100755
index 000000000000..d2ae1135854f
--- /dev/null
+++ b/test/truffle/integration/intrument-all-nodes.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+source test/truffle/common.sh.inc
+
+export TRUFFLERUBY_CHECK_PREINITIALIZED_SPEC=false
+jt test fast -- --instrument-all-nodes

From ac8a083e265f6ba2a65901a20c9130144c840d9d Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Wed, 24 Jan 2024 16:54:49 +0100
Subject: [PATCH 074/131] Tag failing spec due to Prism warning issue

* See https://github.com/ruby/prism/issues/2082
---
 spec/tags/language/END_tags.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/tags/language/END_tags.txt b/spec/tags/language/END_tags.txt
index 0cec2bc81b77..5e5a27cc7080 100644
--- a/spec/tags/language/END_tags.txt
+++ b/spec/tags/language/END_tags.txt
@@ -11,3 +11,4 @@ slow:The END keyword runs only once for multiple calls
 slow:The END keyword warns when END is used in a method
 slow:The END keyword END blocks and at_exit callbacks are mixed runs them all in reverse order of registration
 slow:The END keyword is affected by the toplevel assignment
+fails(prism, https://github.com/ruby/prism/issues/2082):The END keyword warns when END is used in a method

From 33917e8c3c3654091d62c6ab4606a407d23564f9 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Thu, 25 Jan 2024 16:41:51 +0100
Subject: [PATCH 075/131] Avoid Encoding#getCharset() as much as possible since
 it does not always work

* Because not every Ruby Encoding has a corresponding Java Charset.
---
 src/main/.checkstyle_checks.xml               |  4 +++
 .../org/truffleruby/RubyFileTypeDetector.java |  3 ++
 .../truffleruby/core/encoding/Encodings.java  |  7 ++++
 .../core/encoding/TStringUtils.java           | 12 +++++++
 .../core/regexp/ClassicRegexp.java            |  6 ++--
 .../core/string/StringOperations.java         | 32 +------------------
 .../core/string/StringSupport.java            |  2 +-
 .../truffleruby/core/string/StringUtils.java  |  1 +
 .../core/time/RubyDateFormatter.java          |  2 +-
 .../parser/YARPTranslatorDriver.java          | 13 ++++----
 10 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/src/main/.checkstyle_checks.xml b/src/main/.checkstyle_checks.xml
index e50b3c76d6b9..38dcc1f504f4 100644
--- a/src/main/.checkstyle_checks.xml
+++ b/src/main/.checkstyle_checks.xml
@@ -285,6 +285,10 @@
       
       
     
+    
+      
+      
+    
     
       
       
diff --git a/src/main/java/org/truffleruby/RubyFileTypeDetector.java b/src/main/java/org/truffleruby/RubyFileTypeDetector.java
index 96609d282b39..ef8ed14422cd 100644
--- a/src/main/java/org/truffleruby/RubyFileTypeDetector.java
+++ b/src/main/java/org/truffleruby/RubyFileTypeDetector.java
@@ -70,7 +70,10 @@ public Charset findEncoding(TruffleFile file) {
         try (BufferedReader fileContent = file.newBufferedReader(StandardCharsets.ISO_8859_1)) {
             var encoding = findEncoding(fileContent);
             if (encoding != null) {
+                // Unfortunately here we have no choice to return a Charset. Not every Ruby encoding has a Charset.
+                // Checkstyle: stop
                 return encoding.jcoding.getCharset();
+                // Checkstyle: resume
             }
         } catch (IOException | SecurityException e) {
             // Reading random files could cause all sorts of errors
diff --git a/src/main/java/org/truffleruby/core/encoding/Encodings.java b/src/main/java/org/truffleruby/core/encoding/Encodings.java
index c67cbaf9fe68..a8cd9d1bf39e 100644
--- a/src/main/java/org/truffleruby/core/encoding/Encodings.java
+++ b/src/main/java/org/truffleruby/core/encoding/Encodings.java
@@ -31,6 +31,9 @@
 import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.core.string.TStringConstants;
 
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
 public final class Encodings {
 
     public static final int INITIAL_NUMBER_OF_ENCODINGS = EncodingDB.getEncodings().size();
@@ -55,6 +58,10 @@ public final class Encodings {
             .getEncoding()
             .getIndex()];
 
+    /** On Linux and macOS the filesystem encoding is always UTF-8 */
+    public static final RubyEncoding FILESYSTEM = UTF_8;
+    public static final Charset FILESYSTEM_CHARSET = StandardCharsets.UTF_8;
+
     static final Encoding DUMMY_ENCODING_BASE = createDummyEncoding();
 
     public Encodings() {
diff --git a/src/main/java/org/truffleruby/core/encoding/TStringUtils.java b/src/main/java/org/truffleruby/core/encoding/TStringUtils.java
index 900910847225..f70cf4ec8d84 100644
--- a/src/main/java/org/truffleruby/core/encoding/TStringUtils.java
+++ b/src/main/java/org/truffleruby/core/encoding/TStringUtils.java
@@ -26,6 +26,7 @@
 
 import static com.oracle.truffle.api.strings.TruffleString.CodeRange.ASCII;
 
+/** Helpers for {@link TruffleString} and general byte[]/java.lang.String/TruffleString conversion */
 public final class TStringUtils {
 
     public static TruffleString.Encoding jcodingToTEncoding(Encoding jcoding) {
@@ -128,6 +129,17 @@ public static byte[] getBytesOrFail(AbstractTruffleString tstring, RubyEncoding
         }
     }
 
+    public static byte[] javaStringToBytes(String value, RubyEncoding encoding) {
+        CompilerAsserts.neverPartOfCompilation("uncached");
+        var tstring = fromJavaString(value, encoding);
+        return getBytesOrCopy(tstring, encoding);
+    }
+
+    public static String bytesToJavaStringOrThrow(byte[] bytes, int offset, int length, RubyEncoding encoding) {
+        var tstring = TStringUtils.fromByteArray(bytes, offset, length, encoding.tencoding);
+        return TStringUtils.toJavaStringOrThrow(tstring, encoding);
+    }
+
     public static boolean isSingleByteOptimizable(AbstractTruffleString truffleString, RubyEncoding encoding) {
         CompilerAsserts.neverPartOfCompilation("Use SingleByteOptimizableNode instead");
         return truffleString.getByteCodeRangeUncached(encoding.tencoding) == ASCII || encoding.isSingleByte;
diff --git a/src/main/java/org/truffleruby/core/regexp/ClassicRegexp.java b/src/main/java/org/truffleruby/core/regexp/ClassicRegexp.java
index e5fb22e9b274..f6873088fe8e 100644
--- a/src/main/java/org/truffleruby/core/regexp/ClassicRegexp.java
+++ b/src/main/java/org/truffleruby/core/regexp/ClassicRegexp.java
@@ -55,6 +55,7 @@
 import org.truffleruby.collections.ByteArrayBuilder;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.encoding.RubyEncoding;
+import org.truffleruby.core.encoding.TStringUtils;
 import org.truffleruby.core.string.ATStringWithEncoding;
 import org.truffleruby.core.string.TStringBuilder;
 import org.truffleruby.core.string.TStringWithEncoding;
@@ -995,12 +996,13 @@ public String[] getNames() {
             return EMPTY_STRING_ARRAY;
         }
 
+        RubyEncoding encoding = Encodings.getBuiltInEncoding(pattern.getEncoding());
         String[] names = new String[nameLength];
         int j = 0;
         for (Iterator i = pattern.namedBackrefIterator(); i.hasNext();) {
             NameEntry e = i.next();
-            //intern() to improve footprint
-            names[j++] = new String(e.name, e.nameP, e.nameEnd - e.nameP, pattern.getEncoding().getCharset()).intern();
+            // intern() to improve footprint
+            names[j++] = TStringUtils.bytesToJavaStringOrThrow(e.name, e.nameP, e.nameEnd - e.nameP, encoding).intern();
         }
 
         return names;
diff --git a/src/main/java/org/truffleruby/core/string/StringOperations.java b/src/main/java/org/truffleruby/core/string/StringOperations.java
index f6d8716edd60..7d23077dc564 100644
--- a/src/main/java/org/truffleruby/core/string/StringOperations.java
+++ b/src/main/java/org/truffleruby/core/string/StringOperations.java
@@ -24,20 +24,14 @@
  */
 package org.truffleruby.core.string;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-
 import com.oracle.truffle.api.strings.AbstractTruffleString;
 import org.jcodings.Encoding;
-import org.jcodings.specific.ASCIIEncoding;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.encoding.TStringUtils;
 
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-
+/** Helpers for {@link java.lang.String} */
 public abstract class StringOperations {
 
     public static RubyString createUTF8String(RubyContext context, RubyLanguage language, String string) {
@@ -63,30 +57,6 @@ public static RubyString createUTF8String(RubyContext context, RubyLanguage lang
         return instance;
     }
 
-    @TruffleBoundary
-    public static byte[] encodeBytes(String value, Encoding encoding) {
-        // Taken from org.jruby.RubyString#encodeByteList.
-
-        if (encoding == ASCIIEncoding.INSTANCE && !isAsciiOnly(value)) {
-            throw new UnsupportedOperationException(
-                    StringUtils.format(
-                            "Can't convert Java String (%s) to Ruby BINARY String because it contains non-ASCII characters",
-                            value));
-        }
-
-        Charset charset = encoding.getCharset();
-
-        if (charset == null) {
-            throw new UnsupportedOperationException("Cannot find Charset to encode " + value + " with " + encoding);
-        }
-
-        final ByteBuffer buffer = charset.encode(CharBuffer.wrap(value));
-        final byte[] bytes = new byte[buffer.limit()];
-        buffer.get(bytes);
-
-        return bytes;
-    }
-
     public static boolean isAsciiOnly(String string) {
         for (int i = 0; i < string.length(); i++) {
             int c = string.charAt(i);
diff --git a/src/main/java/org/truffleruby/core/string/StringSupport.java b/src/main/java/org/truffleruby/core/string/StringSupport.java
index 92f5cc42308e..c09219d5a8c0 100644
--- a/src/main/java/org/truffleruby/core/string/StringSupport.java
+++ b/src/main/java/org/truffleruby/core/string/StringSupport.java
@@ -1656,7 +1656,7 @@ public static Pair undump(ATStringWithEncoding tst
                                 context,
                                 context.getCoreExceptions().runtimeError(INVALID_FORMAT_MESSAGE, currentNode));
                     }
-                    String encnameString = new String(bytes, encname, size, encoding.jcoding.getCharset());
+                    String encnameString = TStringUtils.bytesToJavaStringOrThrow(bytes, encname, size, encoding);
                     RubyEncoding enc2 = context.getEncodingManager().getRubyEncoding(encnameString);
                     if (enc2 == null) {
                         throw new RaiseException(
diff --git a/src/main/java/org/truffleruby/core/string/StringUtils.java b/src/main/java/org/truffleruby/core/string/StringUtils.java
index 944fdb9698ee..52ef32dacaf7 100644
--- a/src/main/java/org/truffleruby/core/string/StringUtils.java
+++ b/src/main/java/org/truffleruby/core/string/StringUtils.java
@@ -13,6 +13,7 @@
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 
+/** {@link TruffleBoundary} methods for {@link java.lang.String} */
 public abstract class StringUtils {
 
     public static final String[] EMPTY_STRING_ARRAY = new String[0];
diff --git a/src/main/java/org/truffleruby/core/time/RubyDateFormatter.java b/src/main/java/org/truffleruby/core/time/RubyDateFormatter.java
index 75579474e4dd..7f64bb1c7740 100644
--- a/src/main/java/org/truffleruby/core/time/RubyDateFormatter.java
+++ b/src/main/java/org/truffleruby/core/time/RubyDateFormatter.java
@@ -556,7 +556,7 @@ public static TStringBuilder formatToTStringBuilder(Token[] compiledPattern, Zon
             // reset formatter
             formatter = RubyTimeOutputFormatter.DEFAULT_FORMATTER;
 
-            toAppendTo.append(StringOperations.encodeBytes(output, toAppendTo.getEncoding()));
+            toAppendTo.append(TStringUtils.javaStringToBytes(output, toAppendTo.getRubyEncoding()));
         }
 
         return toAppendTo;
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index 5f11eae51858..528c762fb827 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -53,6 +53,8 @@
 import org.truffleruby.core.DummyNode;
 import org.truffleruby.core.binding.BindingNodes;
 import org.truffleruby.core.binding.SetBindingFrameForEvalNode;
+import org.truffleruby.core.encoding.Encodings;
+import org.truffleruby.core.encoding.TStringUtils;
 import org.truffleruby.core.kernel.AutoSplitNode;
 import org.truffleruby.core.kernel.ChompLoopNode;
 import org.truffleruby.core.kernel.KernelGetsNode;
@@ -90,8 +92,6 @@
 import org.prism.ParseResult;
 import org.prism.Parser;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -429,7 +429,7 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
 
         byte[] filepath;
         int line = rubySource.getLineOffset() + 1;
-        byte[] encoding = StringOperations.encodeAsciiBytes(rubySource.getEncoding().name.toString()); // encoding name is supposed to contain only ASCII characters
+        byte[] encoding = StringOperations.encodeAsciiBytes(rubySource.getEncoding().toString()); // encoding name is supposed to contain only ASCII characters
         boolean frozenStringLiteral = configuration.isFrozenStringLiteral();
         boolean verbose = true;
         // The vendored version of prism in CRuby 3.3.0
@@ -438,8 +438,7 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
         byte[][][] scopes;
 
         if (rubySource.isEval()) {
-            Charset sourceCharset = rubySource.getEncoding().jcoding.getCharset();
-            filepath = rubySource.getSourcePath().getBytes(sourceCharset); // encoding of the eval's String argument
+            filepath = rubySource.getSourcePath().getBytes(Encodings.FILESYSTEM_CHARSET);
 
             int scopesCount = localVariableNames.size();
             scopes = new byte[scopesCount][][];
@@ -451,7 +450,7 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
                 byte[][] namesBytes = new byte[namesList.size()][];
                 int j = 0;
                 for (var name : namesList) {
-                    namesBytes[j] = name.getBytes(sourceCharset);
+                    namesBytes[j] = TStringUtils.javaStringToBytes(name, rubySource.getEncoding());
                     j++;
                 }
                 scopes[i] = namesBytes;
@@ -460,7 +459,7 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
         } else {
             assert localVariableNames.isEmpty(); // parsing of the whole source file cannot have outer scopes
 
-            filepath = rubySource.getSourcePath().getBytes(StandardCharsets.UTF_8); // filesystem encoding, that is supposed to be always UTF-8
+            filepath = rubySource.getSourcePath().getBytes(Encodings.FILESYSTEM_CHARSET);
             scopes = new byte[0][][];
         }
 

From 0479923a4e163c607d8b71fe9958f285319f0407 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Thu, 25 Jan 2024 16:56:32 +0100
Subject: [PATCH 076/131] Use our own bytes to java.lang.String conversion for
 Prism Loader

* So we don't rely on Charset which does not exist e.g. for ISO-8859-10.
---
 .../org/truffleruby/parser/YARPLoader.java    | 77 +++++++++++++++++++
 .../parser/YARPTranslatorDriver.java          |  4 +-
 2 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/org/truffleruby/parser/YARPLoader.java

diff --git a/src/main/java/org/truffleruby/parser/YARPLoader.java b/src/main/java/org/truffleruby/parser/YARPLoader.java
new file mode 100644
index 000000000000..dd0458e3821e
--- /dev/null
+++ b/src/main/java/org/truffleruby/parser/YARPLoader.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2002-2004 Anders Bengtsson 
+ * Copyright (C) 2002-2004 Jan Arne Petersen 
+ * Copyright (C) 2004 Thomas E Enebo 
+ * Copyright (C) 2004 Stefan Matthias Aust 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the GPL or the LGPL.
+ */
+package org.truffleruby.parser;
+
+import org.prism.Loader;
+import org.prism.Nodes;
+import org.prism.ParseResult;
+import org.truffleruby.core.encoding.EncodingManager;
+import org.truffleruby.core.encoding.RubyEncoding;
+import org.truffleruby.core.encoding.TStringUtils;
+
+import java.nio.charset.Charset;
+
+public final class YARPLoader extends Loader {
+
+    public static ParseResult load(byte[] serialized, Nodes.Source source, EncodingManager encodingManager,
+            RubySource rubySource) {
+        return new YARPLoader(serialized, source, encodingManager, rubySource).load();
+    }
+
+    private final EncodingManager encodingManager;
+    private final RubySource rubySource;
+    private RubyEncoding encoding = null;
+
+    public YARPLoader(byte[] serialized, Nodes.Source source, EncodingManager encodingManager, RubySource rubySource) {
+        super(serialized, source);
+        this.encodingManager = encodingManager;
+        this.rubySource = rubySource;
+    }
+
+    @Override
+    public Charset getEncodingCharset(String encodingName) {
+        encoding = encodingManager.getRubyEncoding(encodingName);
+        assert encoding == rubySource.getEncoding();
+        return null; // encodingCharset is not used
+    }
+
+    @Override
+    public String bytesToName(byte[] bytes) {
+        return TStringUtils.bytesToJavaStringOrThrow(bytes, 0, bytes.length, encoding);
+    }
+
+}
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index 528c762fb827..804f68b7f46d 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -87,7 +87,6 @@
 import org.truffleruby.parser.parser.ParserConfiguration;
 import org.truffleruby.parser.scope.StaticScope;
 import org.truffleruby.shared.Metrics;
-import org.prism.Loader;
 import org.prism.Nodes;
 import org.prism.ParseResult;
 import org.prism.Parser;
@@ -469,7 +468,8 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
 
         Nodes.Source yarpSource = createYARPSource(sourceBytes, rubySource);
         parseEnvironment.yarpSource = yarpSource;
-        ParseResult parseResult = Loader.load(serializedBytes, yarpSource);
+        ParseResult parseResult = YARPLoader.load(serializedBytes, yarpSource, context.getEncodingManager(),
+                rubySource);
 
         final String filename = rubySource.getSourcePath();
         final ParseResult.Error[] errors = parseResult.errors;

From f06c59ef7d5f065c4bf1229fae4c943e7ee4046c Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Thu, 25 Jan 2024 18:05:56 +0100
Subject: [PATCH 077/131] Add tool to conveniently show the Truffle AST

---
 tool/truffle_ast.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 tool/truffle_ast.rb

diff --git a/tool/truffle_ast.rb b/tool/truffle_ast.rb
new file mode 100644
index 000000000000..a1e7eec021bc
--- /dev/null
+++ b/tool/truffle_ast.rb
@@ -0,0 +1,16 @@
+# Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 2.0, or
+# GNU General Public License version 2, or
+# GNU Lesser General Public License version 2.1.
+
+abort "Usage: jt ruby #{__FILE__} FILE or 'CODE'" unless ARGV.size == 1
+if File.exist?(ARGV[0])
+  code = File.read(ARGV[0])
+else
+  code = ARGV[0]
+end
+
+puts Truffle::Debug.parse_and_dump_truffle_ast(code, "org.truffleruby.language.RubyTopLevelRootNode", 0, true).strip

From 17a5fb4bf6e5839c86c4c51036746b06468387a2 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Thu, 25 Jan 2024 18:06:18 +0100
Subject: [PATCH 078/131] Reformat coverage test for convenience

---
 test/truffle/integration/coverage/test.rb | 32 ++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/test/truffle/integration/coverage/test.rb b/test/truffle/integration/coverage/test.rb
index 16c953f36105..065637cdeb7c 100644
--- a/test/truffle/integration/coverage/test.rb
+++ b/test/truffle/integration/coverage/test.rb
@@ -15,6 +15,36 @@
 result = Coverage.result
 key = result.keys.find { |k| k.end_with?('subject.rb') }
 data = result[key]
-expected = [nil, nil, nil, nil, nil, nil, nil, nil, 1, 1, nil, 1, 10, nil, nil, 1, nil, 1, 1, nil, nil, 1, 2, nil, nil, 1, 1, nil, 1]
+expected = [
+  nil,
+  nil,
+  nil,
+  nil,
+  nil,
+  nil,
+  nil,
+  nil,
+  1,  # a = 1
+  1,  # b = 2
+  nil,
+  1,  # 10.times do
+  10, #   c = 3
+  nil,# end
+  nil,
+  1,  # d = 4
+  nil,
+  1,  # if d == 4
+  1,  #   e = 5
+  nil,# end
+  nil,
+  1,  # def foo
+  2,  #   f = 6
+  nil,# end
+  nil,
+  1,  # foo
+  1,  # foo
+  nil,
+  1   # g = 7
+]
 
 raise "coverage data:\n#{data}\nnot as expected:\n#{expected}" unless data == expected

From 30b13486e01e66cf1615ef08e65b9c33b7801cdf Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Thu, 25 Jan 2024 18:06:41 +0100
Subject: [PATCH 079/131] doExecuteVoid() must not be delegated by
 RubyNodeWrapper

* Otherwise coverage does not work because instrumentation events
  are not called at all as it goes
  wrapper.doExecuteVoid -> node.doExecuteVoid -> node.execute
  instead of:
  wrapper.doExecuteVoid -> wrapper.execute (events) -> node.execute
---
 .../truffleruby/language/RubyContextSourceNode.java  |  5 -----
 src/main/java/org/truffleruby/language/RubyNode.java | 12 +++++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/truffleruby/language/RubyContextSourceNode.java b/src/main/java/org/truffleruby/language/RubyContextSourceNode.java
index 4f68b6aefb1f..dd70069faabb 100644
--- a/src/main/java/org/truffleruby/language/RubyContextSourceNode.java
+++ b/src/main/java/org/truffleruby/language/RubyContextSourceNode.java
@@ -21,11 +21,6 @@ public abstract class RubyContextSourceNode extends RubyNode {
     private int sourceLength;
     private byte flags;
 
-    @Override
-    public void doExecuteVoid(VirtualFrame frame) {
-        execute(frame);
-    }
-
     @Override
     public Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext context) {
         return RubyNode.defaultIsDefined(this);
diff --git a/src/main/java/org/truffleruby/language/RubyNode.java b/src/main/java/org/truffleruby/language/RubyNode.java
index 3f53a9cc5321..8d1fc6d3d7a0 100644
--- a/src/main/java/org/truffleruby/language/RubyNode.java
+++ b/src/main/java/org/truffleruby/language/RubyNode.java
@@ -51,17 +51,19 @@ public abstract class RubyNode extends RubyBaseNodeWithExecute implements Instru
 
     public static final RubyNode[] EMPTY_ARRAY = new RubyNode[0];
 
-    private static final byte FLAG_NEWLINE = 0;
-    private static final byte FLAG_COVERAGE_LINE = 1;
-    private static final byte FLAG_CALL = 2;
-    private static final byte FLAG_ROOT = 3;
+    private static final byte FLAG_NEWLINE = 0;       // 1<<0 = 1
+    private static final byte FLAG_COVERAGE_LINE = 1; // 1<<1 = 2
+    private static final byte FLAG_CALL = 2;          // 1<<2 = 4
+    private static final byte FLAG_ROOT = 3;          // 1<<3 = 8
 
     protected static final int NO_SOURCE = -1;
 
     /* This method does not start with "execute" on purpose, so the Truffle DSL does not generate useless copies of this
      * method which would increase the number of runtime compilable methods. */
     // Declared abstract here so the instrumentation wrapper delegates it
-    public abstract void doExecuteVoid(VirtualFrame frame);
+    public void doExecuteVoid(VirtualFrame frame) {
+        execute(frame);
+    }
 
     // Declared abstract here so the instrumentation wrapper delegates it
     public abstract Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext context);

From a3b90a8b567bb380b0885e7be1b196b7ea2d24c2 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Thu, 25 Jan 2024 18:25:20 +0100
Subject: [PATCH 080/131] Correctly instrument executeVoid()

---
 .../core/array/ArrayConcatNode.java           | 10 +--
 .../core/array/ArrayLiteralNode.java          | 10 +--
 .../truffleruby/core/cast/HashCastNode.java   |  9 +--
 .../core/hash/HashLiteralNode.java            | 10 +--
 .../language/RubyContextSourceNode.java       | 54 +++------------
 ...ubyContextSourceNodeCustomExecuteVoid.java | 69 +++++++++++++++++++
 .../org/truffleruby/language/RubyNode.java    | 10 ++-
 .../language/control/ElidableResultNode.java  | 10 +--
 .../control/ExecuteAndReturnTrueNode.java     |  2 +-
 .../language/control/InvalidReturnNode.java   |  2 +-
 .../language/control/SequenceNode.java        | 12 ++--
 .../language/control/WhileNode.java           |  4 +-
 .../language/defined/DefinedNode.java         |  8 ++-
 .../language/exceptions/EnsureNode.java       | 12 ++--
 .../language/locals/InitFlipFlopSlotNode.java | 11 +--
 15 files changed, 139 insertions(+), 94 deletions(-)
 create mode 100644 src/main/java/org/truffleruby/language/RubyContextSourceNodeCustomExecuteVoid.java

diff --git a/src/main/java/org/truffleruby/core/array/ArrayConcatNode.java b/src/main/java/org/truffleruby/core/array/ArrayConcatNode.java
index a86e3d874684..64701d5f183e 100644
--- a/src/main/java/org/truffleruby/core/array/ArrayConcatNode.java
+++ b/src/main/java/org/truffleruby/core/array/ArrayConcatNode.java
@@ -10,7 +10,8 @@
 package org.truffleruby.core.array;
 
 import org.truffleruby.core.array.ArrayBuilderNode.BuilderState;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.Nil;
+import org.truffleruby.language.RubyContextSourceNodeCustomExecuteVoid;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.CompilerDirectives;
@@ -19,7 +20,7 @@
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 /** Concatenate argument arrays (translating a org.jruby.ast.ArgsCatParseNode). */
-public final class ArrayConcatNode extends RubyContextSourceNode {
+public final class ArrayConcatNode extends RubyContextSourceNodeCustomExecuteVoid {
 
     @Children private final RubyNode[] children;
     // Use an arrayBuilderNode to stabilize the array type for a given location.
@@ -75,10 +76,11 @@ public RubyArray execute(VirtualFrame frame) {
 
     @ExplodeLoop
     @Override
-    public void doExecuteVoid(VirtualFrame frame) {
+    public Nil executeVoid(VirtualFrame frame) {
         for (int n = 0; n < children.length; n++) {
-            children[n].doExecuteVoid(frame);
+            children[n].executeVoid(frame);
         }
+        return nil;
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/core/array/ArrayLiteralNode.java b/src/main/java/org/truffleruby/core/array/ArrayLiteralNode.java
index f3b9081fb4eb..1c6da5e98d05 100644
--- a/src/main/java/org/truffleruby/core/array/ArrayLiteralNode.java
+++ b/src/main/java/org/truffleruby/core/array/ArrayLiteralNode.java
@@ -13,7 +13,8 @@
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.CoreLibrary;
 import org.truffleruby.core.array.library.ArrayStoreLibrary;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.Nil;
+import org.truffleruby.language.RubyContextSourceNodeCustomExecuteVoid;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.CompilerDirectives;
@@ -21,7 +22,7 @@
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import org.truffleruby.language.objects.AllocationTracing;
 
-public abstract class ArrayLiteralNode extends RubyContextSourceNode {
+public abstract class ArrayLiteralNode extends RubyContextSourceNodeCustomExecuteVoid {
 
     public static ArrayLiteralNode create(RubyLanguage language, RubyNode[] values) {
         return new UninitialisedArrayLiteralNode(language, values);
@@ -74,10 +75,11 @@ public final RubyNode cloneUninitialized() {
 
     @ExplodeLoop
     @Override
-    public void doExecuteVoid(VirtualFrame frame) {
+    public final Nil executeVoid(VirtualFrame frame) {
         for (RubyNode value : values) {
-            value.doExecuteVoid(frame);
+            value.executeVoid(frame);
         }
+        return nil;
     }
 
     @ExplodeLoop
diff --git a/src/main/java/org/truffleruby/core/cast/HashCastNode.java b/src/main/java/org/truffleruby/core/cast/HashCastNode.java
index ee7fe71a1263..8550801039cf 100644
--- a/src/main/java/org/truffleruby/core/cast/HashCastNode.java
+++ b/src/main/java/org/truffleruby/core/cast/HashCastNode.java
@@ -14,8 +14,9 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import org.truffleruby.core.hash.RubyHash;
+import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyBaseNode;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyContextSourceNodeCustomExecuteVoid;
 import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.control.RaiseException;
@@ -64,7 +65,7 @@ static RubyHash cast(Node node, Object object,
 
     /** Must be a RubyNode because it's used for ** in the translator. */
     @NodeChild(value = "childNode", type = RubyNode.class)
-    public abstract static class HashCastASTNode extends RubyContextSourceNode {
+    public abstract static class HashCastASTNode extends RubyContextSourceNodeCustomExecuteVoid {
 
         protected abstract RubyNode getChildNode();
 
@@ -76,8 +77,8 @@ RubyHash cast(Object object,
         }
 
         @Override
-        public void doExecuteVoid(VirtualFrame frame) {
-            getChildNode().doExecuteVoid(frame);
+        public final Nil executeVoid(VirtualFrame frame) {
+            return getChildNode().executeVoid(frame);
         }
 
         @Override
diff --git a/src/main/java/org/truffleruby/core/hash/HashLiteralNode.java b/src/main/java/org/truffleruby/core/hash/HashLiteralNode.java
index 66f3d0b70ed2..d70c150ec555 100644
--- a/src/main/java/org/truffleruby/core/hash/HashLiteralNode.java
+++ b/src/main/java/org/truffleruby/core/hash/HashLiteralNode.java
@@ -15,13 +15,14 @@
 import org.truffleruby.core.hash.library.EmptyHashStore;
 import org.truffleruby.core.hash.library.PackedHashStoreLibrary;
 import org.truffleruby.core.hash.library.PackedHashStoreLibraryFactory;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.Nil;
+import org.truffleruby.language.RubyContextSourceNodeCustomExecuteVoid;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 
-public abstract class HashLiteralNode extends RubyContextSourceNode {
+public abstract class HashLiteralNode extends RubyContextSourceNodeCustomExecuteVoid {
 
     @Children protected final RubyNode[] keyValues;
 
@@ -48,9 +49,10 @@ public static HashLiteralNode create(RubyNode[] keyValues, RubyLanguage language
 
     @ExplodeLoop
     @Override
-    public void doExecuteVoid(VirtualFrame frame) {
+    public final Nil executeVoid(VirtualFrame frame) {
         for (RubyNode child : keyValues) {
-            child.doExecuteVoid(frame);
+            child.executeVoid(frame);
         }
+        return nil;
     }
 }
diff --git a/src/main/java/org/truffleruby/language/RubyContextSourceNode.java b/src/main/java/org/truffleruby/language/RubyContextSourceNode.java
index dd70069faabb..749f4d34e3a4 100644
--- a/src/main/java/org/truffleruby/language/RubyContextSourceNode.java
+++ b/src/main/java/org/truffleruby/language/RubyContextSourceNode.java
@@ -9,57 +9,19 @@
  */
 package org.truffleruby.language;
 
-import org.truffleruby.RubyContext;
-import org.truffleruby.RubyLanguage;
-
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 /** See {@link RubyNode} */
-public abstract class RubyContextSourceNode extends RubyNode {
-
-    private int sourceCharIndex = NO_SOURCE;
-    private int sourceLength;
-    private byte flags;
-
-    @Override
-    public Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext context) {
-        return RubyNode.defaultIsDefined(this);
-    }
-
-    @Override
-    protected byte getFlags() {
-        return flags;
-    }
-
-    @Override
-    protected void setFlags(byte flags) {
-        this.flags = flags;
-    }
+public abstract class RubyContextSourceNode extends RubyContextSourceNodeCustomExecuteVoid {
 
+    /** Final here to avoid the DSL generating extra redundant methods for this. Subclass
+     * {@link org.truffleruby.language.RubyContextSourceNodeCustomExecuteVoid} for implementing a custom executeVoid().
+     * Be careful to either mark the executeVoid() override as final or the class as final, otherwise the DSL will
+     * override and just call execute() which would ignore our override. */
     @Override
-    protected int getSourceCharIndex() {
-        return sourceCharIndex;
+    public final Nil executeVoid(VirtualFrame frame) {
+        execute(frame);
+        return nil;
     }
 
-    @Override
-    protected void setSourceCharIndex(int sourceCharIndex) {
-        this.sourceCharIndex = sourceCharIndex;
-    }
-
-    @Override
-    protected int getSourceLength() {
-        return sourceLength;
-    }
-
-    @Override
-    protected void setSourceLength(int sourceLength) {
-        this.sourceLength = sourceLength;
-    }
-
-    public RubyContextSourceNode copyFlags(RubyContextSourceNode original) {
-        this.sourceCharIndex = original.sourceCharIndex;
-        this.sourceLength = original.sourceLength;
-        this.flags = original.flags;
-        return this;
-    }
 }
diff --git a/src/main/java/org/truffleruby/language/RubyContextSourceNodeCustomExecuteVoid.java b/src/main/java/org/truffleruby/language/RubyContextSourceNodeCustomExecuteVoid.java
new file mode 100644
index 000000000000..725d95931da4
--- /dev/null
+++ b/src/main/java/org/truffleruby/language/RubyContextSourceNodeCustomExecuteVoid.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.language;
+
+import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
+
+import com.oracle.truffle.api.frame.VirtualFrame;
+
+/** See {@link RubyNode} */
+public abstract class RubyContextSourceNodeCustomExecuteVoid extends RubyNode {
+
+    private int sourceCharIndex = NO_SOURCE;
+    private int sourceLength;
+    private byte flags;
+
+    /** See {@link RubyContextSourceNode#executeVoid(VirtualFrame)} */
+    @Override
+    public abstract Nil executeVoid(VirtualFrame frame);
+
+    @Override
+    public Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext context) {
+        return RubyNode.defaultIsDefined(this);
+    }
+
+    @Override
+    protected byte getFlags() {
+        return flags;
+    }
+
+    @Override
+    protected void setFlags(byte flags) {
+        this.flags = flags;
+    }
+
+    @Override
+    protected int getSourceCharIndex() {
+        return sourceCharIndex;
+    }
+
+    @Override
+    protected void setSourceCharIndex(int sourceCharIndex) {
+        this.sourceCharIndex = sourceCharIndex;
+    }
+
+    @Override
+    protected int getSourceLength() {
+        return sourceLength;
+    }
+
+    @Override
+    protected void setSourceLength(int sourceLength) {
+        this.sourceLength = sourceLength;
+    }
+
+    public RubyContextSourceNodeCustomExecuteVoid copyFlags(RubyContextSourceNodeCustomExecuteVoid original) {
+        this.sourceCharIndex = original.sourceCharIndex;
+        this.sourceLength = original.sourceLength;
+        this.flags = original.flags;
+        return this;
+    }
+}
diff --git a/src/main/java/org/truffleruby/language/RubyNode.java b/src/main/java/org/truffleruby/language/RubyNode.java
index 8d1fc6d3d7a0..94d05b7d6c49 100644
--- a/src/main/java/org/truffleruby/language/RubyNode.java
+++ b/src/main/java/org/truffleruby/language/RubyNode.java
@@ -58,12 +58,10 @@ public abstract class RubyNode extends RubyBaseNodeWithExecute implements Instru
 
     protected static final int NO_SOURCE = -1;
 
-    /* This method does not start with "execute" on purpose, so the Truffle DSL does not generate useless copies of this
-     * method which would increase the number of runtime compilable methods. */
-    // Declared abstract here so the instrumentation wrapper delegates it
-    public void doExecuteVoid(VirtualFrame frame) {
-        execute(frame);
-    }
+    // Used when the return value of a node is ignored syntactically.
+    // Returns Nil instead of void to force RubyNodeWrapper to call `delegateNode.executeVoid(frame)`, otherwise
+    // it would call `delegateNode.execute(frame)` in `execute()` which is semantically incorrect for defined?().
+    public abstract Nil executeVoid(VirtualFrame frame);
 
     // Declared abstract here so the instrumentation wrapper delegates it
     public abstract Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext context);
diff --git a/src/main/java/org/truffleruby/language/control/ElidableResultNode.java b/src/main/java/org/truffleruby/language/control/ElidableResultNode.java
index f5917ea60d12..52687d5528b2 100644
--- a/src/main/java/org/truffleruby/language/control/ElidableResultNode.java
+++ b/src/main/java/org/truffleruby/language/control/ElidableResultNode.java
@@ -11,7 +11,8 @@
 
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.Nil;
+import org.truffleruby.language.RubyContextSourceNodeCustomExecuteVoid;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -21,7 +22,7 @@
 /** This node has a pair of children. One has side effects and the other returns the result. If the result isn't needed
  * all we execute is the side effects. */
 @NodeInfo(cost = NodeCost.NONE)
-public final class ElidableResultNode extends RubyContextSourceNode {
+public final class ElidableResultNode extends RubyContextSourceNodeCustomExecuteVoid {
 
     @Child private RubyNode required;
     @Child private RubyNode elidableResult;
@@ -33,13 +34,14 @@ public ElidableResultNode(RubyNode required, RubyNode elidableResult) {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        required.doExecuteVoid(frame);
+        required.executeVoid(frame);
         return elidableResult.execute(frame);
     }
 
     @Override
-    public void doExecuteVoid(VirtualFrame frame) {
+    public Nil executeVoid(VirtualFrame frame) {
         required.execute(frame);
+        return nil;
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/language/control/ExecuteAndReturnTrueNode.java b/src/main/java/org/truffleruby/language/control/ExecuteAndReturnTrueNode.java
index e56e72a12f5d..d523e97b13bc 100644
--- a/src/main/java/org/truffleruby/language/control/ExecuteAndReturnTrueNode.java
+++ b/src/main/java/org/truffleruby/language/control/ExecuteAndReturnTrueNode.java
@@ -24,7 +24,7 @@ public ExecuteAndReturnTrueNode(RubyNode child) {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        child.doExecuteVoid(frame);
+        child.executeVoid(frame);
         return true;
     }
 
diff --git a/src/main/java/org/truffleruby/language/control/InvalidReturnNode.java b/src/main/java/org/truffleruby/language/control/InvalidReturnNode.java
index 6fe1f7cc7948..dbfe36ef260c 100644
--- a/src/main/java/org/truffleruby/language/control/InvalidReturnNode.java
+++ b/src/main/java/org/truffleruby/language/control/InvalidReturnNode.java
@@ -24,7 +24,7 @@ public InvalidReturnNode(RubyNode value) {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        value.doExecuteVoid(frame);
+        value.executeVoid(frame);
         throw new RaiseException(getContext(), coreExceptions().unexpectedReturn(this));
     }
 
diff --git a/src/main/java/org/truffleruby/language/control/SequenceNode.java b/src/main/java/org/truffleruby/language/control/SequenceNode.java
index e7e758c0986a..e866d8853f4e 100644
--- a/src/main/java/org/truffleruby/language/control/SequenceNode.java
+++ b/src/main/java/org/truffleruby/language/control/SequenceNode.java
@@ -9,7 +9,8 @@
  */
 package org.truffleruby.language.control;
 
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.Nil;
+import org.truffleruby.language.RubyContextSourceNodeCustomExecuteVoid;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -18,7 +19,7 @@
 import com.oracle.truffle.api.nodes.NodeInfo;
 
 @NodeInfo(cost = NodeCost.NONE)
-public final class SequenceNode extends RubyContextSourceNode {
+public final class SequenceNode extends RubyContextSourceNodeCustomExecuteVoid {
 
     @Children private final RubyNode[] body;
 
@@ -31,7 +32,7 @@ public SequenceNode(RubyNode[] body) {
     @Override
     public Object execute(VirtualFrame frame) {
         for (int n = 0; n < body.length - 1; n++) {
-            body[n].doExecuteVoid(frame);
+            body[n].executeVoid(frame);
         }
 
         return body[body.length - 1].execute(frame);
@@ -39,10 +40,11 @@ public Object execute(VirtualFrame frame) {
 
     @ExplodeLoop
     @Override
-    public void doExecuteVoid(VirtualFrame frame) {
+    public Nil executeVoid(VirtualFrame frame) {
         for (int n = 0; n < body.length; n++) {
-            body[n].doExecuteVoid(frame);
+            body[n].executeVoid(frame);
         }
+        return nil;
     }
 
     public RubyNode[] getSequence() {
diff --git a/src/main/java/org/truffleruby/language/control/WhileNode.java b/src/main/java/org/truffleruby/language/control/WhileNode.java
index cd3e13f8fade..e33f63f96485 100644
--- a/src/main/java/org/truffleruby/language/control/WhileNode.java
+++ b/src/main/java/org/truffleruby/language/control/WhileNode.java
@@ -97,7 +97,7 @@ boolean doRepeating(VirtualFrame frame,
 
             while (true) { // for redo
                 try {
-                    body.doExecuteVoid(frame);
+                    body.executeVoid(frame);
                     return true;
                 } catch (NextException e) {
                     nextUsed.enter(this);
@@ -131,7 +131,7 @@ boolean doRepeating(VirtualFrame frame,
                 @Cached InlinedBranchProfile redoUsed,
                 @Cached InlinedBranchProfile nextUsed) {
             try {
-                body.doExecuteVoid(frame);
+                body.executeVoid(frame);
             } catch (NextException e) {
                 nextUsed.enter(this);
             } catch (RedoException e) {
diff --git a/src/main/java/org/truffleruby/language/defined/DefinedNode.java b/src/main/java/org/truffleruby/language/defined/DefinedNode.java
index de1c335485c2..242fdc9e8b3a 100644
--- a/src/main/java/org/truffleruby/language/defined/DefinedNode.java
+++ b/src/main/java/org/truffleruby/language/defined/DefinedNode.java
@@ -9,12 +9,13 @@
  */
 package org.truffleruby.language.defined;
 
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.Nil;
+import org.truffleruby.language.RubyContextSourceNodeCustomExecuteVoid;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public final class DefinedNode extends RubyContextSourceNode {
+public final class DefinedNode extends RubyContextSourceNodeCustomExecuteVoid {
 
     @Child private RubyNode child;
 
@@ -28,8 +29,9 @@ public Object execute(VirtualFrame frame) {
     }
 
     @Override
-    public void doExecuteVoid(VirtualFrame frame) {
+    public Nil executeVoid(VirtualFrame frame) {
         // do nothing
+        return nil;
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/language/exceptions/EnsureNode.java b/src/main/java/org/truffleruby/language/exceptions/EnsureNode.java
index 1f2ecf0c4ea3..5fd855045887 100644
--- a/src/main/java/org/truffleruby/language/exceptions/EnsureNode.java
+++ b/src/main/java/org/truffleruby/language/exceptions/EnsureNode.java
@@ -17,14 +17,15 @@
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import org.truffleruby.core.exception.ExceptionOperations;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.Nil;
+import org.truffleruby.language.RubyContextSourceNodeCustomExecuteVoid;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import org.truffleruby.language.control.KillException;
 import org.truffleruby.language.threadlocal.ThreadLocalGlobals;
 
-public abstract class EnsureNode extends RubyContextSourceNode {
+public abstract class EnsureNode extends RubyContextSourceNodeCustomExecuteVoid {
 
     @Child private RubyNode tryPart;
     @Child private RubyNode ensurePart;
@@ -41,8 +42,9 @@ public final Object execute(VirtualFrame frame) {
     }
 
     @Override
-    public final void doExecuteVoid(VirtualFrame frame) {
+    public final Nil executeVoid(VirtualFrame frame) {
         executeCommon(frame, true);
+        return nil;
     }
 
     protected abstract Object executeCommon(VirtualFrame frame, boolean executeVoid);
@@ -62,7 +64,7 @@ Object ensure(VirtualFrame frame, boolean executeVoid,
 
         try {
             if (executeVoid) {
-                tryPart.doExecuteVoid(frame);
+                tryPart.executeVoid(frame);
             } else {
                 value = tryPart.execute(frame);
             }
@@ -88,7 +90,7 @@ Object ensure(VirtualFrame frame, boolean executeVoid,
             threadLocalGlobals.setLastException(exceptionObject);
         }
         try {
-            ensurePart.doExecuteVoid(frame);
+            ensurePart.executeVoid(frame);
         } finally {
             if (guestException != null) {
                 threadLocalGlobals.setLastException(previousException);
diff --git a/src/main/java/org/truffleruby/language/locals/InitFlipFlopSlotNode.java b/src/main/java/org/truffleruby/language/locals/InitFlipFlopSlotNode.java
index 731ecb509df9..c613e7bb749e 100644
--- a/src/main/java/org/truffleruby/language/locals/InitFlipFlopSlotNode.java
+++ b/src/main/java/org/truffleruby/language/locals/InitFlipFlopSlotNode.java
@@ -9,12 +9,12 @@
  */
 package org.truffleruby.language.locals;
 
-import org.truffleruby.language.RubyContextSourceNode;
-
 import com.oracle.truffle.api.frame.VirtualFrame;
+import org.truffleruby.language.Nil;
+import org.truffleruby.language.RubyContextSourceNodeCustomExecuteVoid;
 import org.truffleruby.language.RubyNode;
 
-public final class InitFlipFlopSlotNode extends RubyContextSourceNode {
+public final class InitFlipFlopSlotNode extends RubyContextSourceNodeCustomExecuteVoid {
 
     private final int frameSlot;
 
@@ -23,13 +23,14 @@ public InitFlipFlopSlotNode(int frameSlot) {
     }
 
     @Override
-    public void doExecuteVoid(VirtualFrame frame) {
+    public Nil executeVoid(VirtualFrame frame) {
         frame.setBoolean(frameSlot, false);
+        return nil;
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
-        doExecuteVoid(frame);
+        executeVoid(frame);
         return null;
     }
 

From 06e4bebff9490efa2d7a8c3dec24edf1a5b19653 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Fri, 26 Jan 2024 12:03:53 +0100
Subject: [PATCH 081/131] Use ZERO_PARAMETERS_NODE consistently

* It leads to much cleaner and more robust code, as our ParametersNode fields are then never null.
---
 .../parser/YARPDefNodeTranslator.java         | 15 ++++++-----
 .../parser/YARPLoadArgumentsTranslator.java   | 27 +++++--------------
 .../truffleruby/parser/YARPTranslator.java    | 23 +++++++++-------
 3 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java
index 54ced7ba3495..5339b0de3bd4 100644
--- a/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java
@@ -45,11 +45,11 @@ public YARPDefNodeTranslator(
         }
     }
 
-    private RubyNode compileMethodBody(Nodes.DefNode node, Arity arity) {
+    private RubyNode compileMethodBody(Nodes.DefNode node, Nodes.ParametersNode parameters, Arity arity) {
         declareLocalVariables(node);
 
         final RubyNode loadArguments = new YARPLoadArgumentsTranslator(
-                node.parameters,
+                parameters,
                 language,
                 environment,
                 arity,
@@ -67,8 +67,8 @@ private RubyNode compileMethodBody(Nodes.DefNode node, Arity arity) {
         return body;
     }
 
-    private RubyMethodRootNode translateMethodNode(Nodes.DefNode node, Arity arity) {
-        RubyNode body = compileMethodBody(node, arity);
+    private RubyMethodRootNode translateMethodNode(Nodes.DefNode node, Nodes.ParametersNode parameters, Arity arity) {
+        RubyNode body = compileMethodBody(node, parameters, arity);
 
         return new RubyMethodRootNode(
                 language,
@@ -81,12 +81,13 @@ private RubyMethodRootNode translateMethodNode(Nodes.DefNode node, Arity arity)
                 arity);
     }
 
-    public CachedLazyCallTargetSupplier buildMethodNodeCompiler(Nodes.DefNode node, Arity arity) {
+    public CachedLazyCallTargetSupplier buildMethodNodeCompiler(Nodes.DefNode node, Nodes.ParametersNode parameters,
+            Arity arity) {
         if (shouldLazyTranslate) {
             return new CachedLazyCallTargetSupplier(
-                    () -> translateMethodNode(node, arity).getCallTarget());
+                    () -> translateMethodNode(node, parameters, arity).getCallTarget());
         } else {
-            final RubyMethodRootNode root = translateMethodNode(node, arity);
+            final RubyMethodRootNode root = translateMethodNode(node, parameters, arity);
             return new CachedLazyCallTargetSupplier(() -> root.getCallTarget());
         }
     }
diff --git a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
index 5553a2d0f918..97b41ceca0d4 100644
--- a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
@@ -11,6 +11,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import org.truffleruby.Layouts;
@@ -74,18 +75,10 @@ public YARPLoadArgumentsTranslator(
         this.isProc = isProc;
         this.isMethod = isMethod;
         this.yarpTranslator = yarpTranslator;
-        this.parameters = parameters;
+        this.parameters = Objects.requireNonNull(parameters);
     }
 
     public RubyNode translate() {
-        if (parameters != null) {
-            return translateWithParameters();
-        } else {
-            return translateWithoutParameters();
-        }
-    }
-
-    private RubyNode translateWithParameters() {
         final List sequence = new ArrayList<>();
 
         sequence.add(Translator.loadSelf(language));
@@ -104,6 +97,11 @@ private RubyNode translateWithParameters() {
             sequence.add(saveMethodBlockArg());
         }
 
+        // Early return for the common case of zero parameters
+        if (parameters == YARPTranslator.ZERO_PARAMETERS_NODE) {
+            return YARPTranslator.sequence(sequence);
+        }
+
         if (parameters.optionals.length > 0) {
             for (var node : parameters.optionals) {
                 sequence.add(node.accept(this)); // Nodes.OptionalParameterNode is expected here
@@ -148,17 +146,6 @@ private RubyNode translateWithParameters() {
         return YARPTranslator.sequence(sequence);
     }
 
-    private RubyNode translateWithoutParameters() {
-        final List sequence = new ArrayList<>();
-
-        sequence.add(Translator.loadSelf(language));
-        if (isMethod) {
-            sequence.add(saveMethodBlockArg());
-        }
-
-        return YARPTranslator.sequence(sequence);
-    }
-
     public RubyNode saveMethodBlockArg() {
         final int slot = environment.declareVar(TranslatorEnvironment.METHOD_BLOCK_NAME);
         return new SaveMethodBlockNode(slot);
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index f121205ea5b3..8d7e6ca298a6 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -130,7 +130,6 @@
 import org.truffleruby.language.locals.WriteLocalVariableNode;
 import org.truffleruby.language.methods.Arity;
 import org.truffleruby.language.methods.BlockDefinitionNode;
-import org.truffleruby.language.methods.CachedLazyCallTargetSupplier;
 import org.truffleruby.language.methods.CatchBreakNode;
 import org.truffleruby.language.methods.LiteralMethodDefinitionNode;
 import org.truffleruby.language.methods.ModuleBodyDefinition;
@@ -520,7 +519,7 @@ private RubyNode translateBlockAndLambda(Nodes.Node node, Nodes.Node parametersN
 
         final Nodes.ParametersNode parameters;
         if (parametersNode instanceof Nodes.BlockParametersNode blockParameters) {
-            parameters = blockParameters.parameters;
+            parameters = blockParameters.parameters != null ? blockParameters.parameters : ZERO_PARAMETERS_NODE;
         } else if (parametersNode instanceof Nodes.NumberedParametersNode numberedParameters) {
             // build Nodes.BlockParametersNode with required parameters _1, _2, etc
             final int maximum = numberedParameters.maximum;
@@ -534,7 +533,7 @@ private RubyNode translateBlockAndLambda(Nodes.Node node, Nodes.Node parametersN
             parameters = new Nodes.ParametersNode(requireds, EMPTY_NODE_ARRAY, null, EMPTY_NODE_ARRAY,
                     EMPTY_NODE_ARRAY, null, null, 0, 0);
         } else if (parametersNode == null) {
-            parameters = null;
+            parameters = ZERO_PARAMETERS_NODE;
         } else {
             throw CompilerDirectives.shouldNotReachHere();
         }
@@ -1487,8 +1486,13 @@ public RubyNode visitDefNode(Nodes.DefNode node) {
             singletonClassNode = null;
         }
 
-        final Arity arity = createArity(node.parameters);
-        final ArgumentDescriptor[] argumentDescriptors = parametersNodeToArgumentDescriptors(node.parameters);
+        Nodes.ParametersNode parameters = node.parameters;
+        if (parameters == null) {
+            parameters = ZERO_PARAMETERS_NODE;
+        }
+
+        final Arity arity = createArity(parameters);
+        final ArgumentDescriptor[] argumentDescriptors = parametersNodeToArgumentDescriptors(parameters);
         final boolean isReceiverSelf = node.receiver instanceof Nodes.SelfNode;
 
         final String parseName = modulePathAndMethodName(node.name, node.receiver != null, isReceiverSelf);
@@ -1515,7 +1519,7 @@ public RubyNode visitDefNode(Nodes.DefNode node) {
                 null,
                 null,
                 environment.modulePath);
-        newEnvironment.parametersNode = node.parameters;
+        newEnvironment.parametersNode = parameters;
 
         final var defNodeTranslator = new YARPDefNodeTranslator(
                 language,
@@ -1525,7 +1529,7 @@ public RubyNode visitDefNode(Nodes.DefNode node) {
                 sourceEncoding,
                 parserContext,
                 currentNode);
-        final CachedLazyCallTargetSupplier callTargetSupplier = defNodeTranslator.buildMethodNodeCompiler(node, arity);
+        var callTargetSupplier = defNodeTranslator.buildMethodNodeCompiler(node, parameters, arity);
 
         final boolean isDefSingleton = singletonClassNode != null;
 
@@ -3770,7 +3774,7 @@ private RubyNode[] translate(Nodes.Node[] nodes) {
     }
 
     private ArgumentDescriptor[] parametersNodeToArgumentDescriptors(Nodes.ParametersNode parametersNode) {
-        if (parametersNode == null) {
+        if (parametersNode == ZERO_PARAMETERS_NODE) {
             return ArgumentDescriptor.EMPTY_ARRAY;
         }
 
@@ -3866,7 +3870,8 @@ private ArgumentDescriptor[] parametersNodeToArgumentDescriptors(Nodes.Parameter
     }
 
     private Arity createArity(Nodes.ParametersNode parametersNode) {
-        if (parametersNode == null) {
+        if (parametersNode == ZERO_PARAMETERS_NODE) {
+            // Arity.NO_ARGUMENTS would be tempting here but that would affect method identity
             return new Arity(0, 0, false);
         }
 

From f86bb5abfed36bccb9478269d16555fea313b193 Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Thu, 25 Jan 2024 18:21:13 +0200
Subject: [PATCH 082/131] Exclude failed MRI test test_float

It seems it's caused by the issue in ruby/prism.

Original exception:
```
_1 (java.lang.AssertionError)
	from org.truffleruby.parser.YARPTranslator.visitLocalVariableReadNode(YARPTranslator.java:2461)
	from org.truffleruby.parser.YARPTranslator.visitLocalVariableReadNode(YARPTranslator.java:181)
```
---
 test/mri/excludes/TestRubyLiteral.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/mri/excludes/TestRubyLiteral.rb b/test/mri/excludes/TestRubyLiteral.rb
index df23aac786f8..75381c044c29 100644
--- a/test/mri/excludes/TestRubyLiteral.rb
+++ b/test/mri/excludes/TestRubyLiteral.rb
@@ -2,3 +2,4 @@
 exclude :test_string, "needs investigation"
 exclude :test_hash_value_omission, "NameError: undefined local variable or method `FOO' for #"
 exclude :test_hash_duplicated_key, "duplicated literal key."
+exclude :test_float, "_1 inside eval, see https://github.com/ruby/prism/issues/2275"

From 80f8e8977026ef8030092f89d4bec4b03d5e8650 Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Thu, 25 Jan 2024 20:33:01 +0200
Subject: [PATCH 083/131] Fix multi assignment with index referencing and splat

The following code
```ruby
h[*k], = ["ok", "ng"]
```
leads to failed assert that takes the last argument (placeholder) in a wrong way.

Original error:
```
ArrayConcatNode@e424bba at no source section (java.lang.AssertionError)
	from org.truffleruby.language.dispatch.RubyCallNode.assign(RubyCallNode.java:147)
	from org.truffleruby.core.array.MultipleAssignmentNode.assign(MultipleAssignmentNode.java:66)
	from org.truffleruby.core.array.MultipleAssignmentNode.execute(MultipleAssignmentNode.java:56)
	from org.truffleruby.language.RubyNode.doExecuteVoid(RubyNode.java:64)
	from org.truffleruby.language.control.SequenceNode.execute(SequenceNode.java:34)
	from org.truffleruby.language.RubyMethodRootNode.execute(RubyMethodRootNode.java:65)
/b/b/e/main/test/mri/tests/ruby/test_assignment.rb:937:in `test_massign_aref_lhs_splat'
```
---
 spec/ruby/language/variables_spec.rb          |  9 +++--
 .../core/array/ArrayConcatNode.java           |  5 +++
 .../core/array/ArrayLiteralNode.java          |  4 +++
 .../language/dispatch/RubyCallNode.java       | 35 +++++++++++++++++--
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/spec/ruby/language/variables_spec.rb b/spec/ruby/language/variables_spec.rb
index 23c2cdb5574f..53d191b45663 100644
--- a/spec/ruby/language/variables_spec.rb
+++ b/spec/ruby/language/variables_spec.rb
@@ -367,8 +367,13 @@ def x(a) a end
 
     it "assigns indexed elements" do
       a = []
-      a[1], a[2] = 1
-      a.should == [nil, 1, nil]
+      a[1], a[2] = 1, 2
+      a.should == [nil, 1, 2]
+
+      # with splatted argument
+      a = []
+      a[*[1]], a[*[2]] = 1, 2
+      a.should == [nil, 1, 2]
     end
 
     it "assigns constants" do
diff --git a/src/main/java/org/truffleruby/core/array/ArrayConcatNode.java b/src/main/java/org/truffleruby/core/array/ArrayConcatNode.java
index 64701d5f183e..3c3ba55dc9d8 100644
--- a/src/main/java/org/truffleruby/core/array/ArrayConcatNode.java
+++ b/src/main/java/org/truffleruby/core/array/ArrayConcatNode.java
@@ -33,6 +33,11 @@ public ArrayConcatNode(RubyNode[] children) {
         this.children = children;
     }
 
+    // getChildren method name is already used
+    public RubyNode[] getElements() {
+        return children;
+    }
+
     @ExplodeLoop
     @Override
     public RubyArray execute(VirtualFrame frame) {
diff --git a/src/main/java/org/truffleruby/core/array/ArrayLiteralNode.java b/src/main/java/org/truffleruby/core/array/ArrayLiteralNode.java
index 1c6da5e98d05..a7c40270e6e6 100644
--- a/src/main/java/org/truffleruby/core/array/ArrayLiteralNode.java
+++ b/src/main/java/org/truffleruby/core/array/ArrayLiteralNode.java
@@ -36,6 +36,10 @@ public ArrayLiteralNode(RubyLanguage language, RubyNode[] values) {
         this.values = values;
     }
 
+    public RubyNode[] getValues() {
+        return values;
+    }
+
     protected RubyArray makeGeneric(VirtualFrame frame, Object[] alreadyExecuted) {
         final ArrayLiteralNode newNode = new ObjectArrayLiteralNode(language, values);
         newNode.copyFlags(this);
diff --git a/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java b/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java
index 8370dadcbfde..75ac3f5d4396 100644
--- a/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java
+++ b/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java
@@ -17,6 +17,8 @@
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayAppendOneNode;
+import org.truffleruby.core.array.ArrayConcatNode;
+import org.truffleruby.core.array.ArrayLiteralNode;
 import org.truffleruby.core.array.AssignableNode;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.cast.BooleanCastNode;
@@ -218,11 +220,15 @@ private void executeArguments(VirtualFrame frame, Object[] rubyArgs) {
 
     @ExplodeLoop
     private void executeArgumentsToAssign(VirtualFrame frame, Object[] rubyArgs) {
+        // BodyTranslator-specific logic: the last element could be DeadNode that is disallowed to be executed
+        // TODO: use #executeArguments method instead after complete switching to YARP
+
+        // execute all arguments but the last one
         for (int i = 0; i < arguments.length - 1; i++) {
             RubyArguments.setArgument(rubyArgs, i, arguments[i].execute(frame));
         }
 
-        // the last element should be either NilNode or DeadNode but DeadNode is disallowed to be executed
+        // execute the last argument
         final int lastIndex = arguments.length - 1;
         if (arguments[lastIndex] instanceof DeadNode) {
             RubyArguments.setArgument(rubyArgs, lastIndex, nil);
@@ -274,9 +280,32 @@ public RubyNode[] getArguments() {
 
     private RubyNode getLastArgumentNode() {
         final RubyNode lastArg = RubyNode.unwrapNode(arguments[arguments.length - 1]);
-        if (isSplatted && lastArg instanceof ArrayAppendOneNode) {
-            return ((ArrayAppendOneNode) lastArg).getValueNode();
+
+        // BodyTranslator-specific condition
+        if (isSplatted && lastArg instanceof ArrayAppendOneNode arrayAppendOneNode) {
+            return arrayAppendOneNode.getValueNode();
         }
+
+        // YARP-specific condition
+        // In case of splat argument (e.g. for code `a[*b], c = 1, 2`) a method (e.g. `#[]=`) has extra argument - value.
+        // Arguments are supposed to have the following structure - ArrayConcatNode(... ArrayLiteralNode([placeholder])).
+        // So return this placeholder node.
+        if (isSplatted && lastArg instanceof ArrayConcatNode arrayConcatNode) {
+            RubyNode[] elements = arrayConcatNode.getElements();
+            assert elements.length > 0;
+
+            RubyNode last = elements[elements.length - 1];
+
+            if (last instanceof ArrayLiteralNode arrayLiteralNode) {
+                RubyNode[] values = arrayLiteralNode.getValues();
+                assert values.length > 0;
+
+                return values[values.length - 1];
+            } else {
+                return last;
+            }
+        }
+
         return lastArg;
     }
 

From 9e2104b745002d4b1816fdb08c0fd6d9e5fc701b Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Fri, 26 Jan 2024 18:27:10 +0100
Subject: [PATCH 084/131] Simplify

---
 src/main/java/org/truffleruby/parser/YARPTranslator.java      | 4 +---
 .../java/org/truffleruby/parser/YARPTranslatorDriver.java     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index 8d7e6ca298a6..cad0a1831738 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -3018,9 +3018,7 @@ public RubyNode visitSourceEncodingNode(Nodes.SourceEncodingNode node) {
 
     @Override
     public RubyNode visitSourceFileNode(Nodes.SourceFileNode node) {
-        // Note: ideally we would use the filesystem encoding here, but it is too early to get that.
-        // The filesystem encoding on Linux and macOS is UTF-8 anyway, so keep it simple.
-        RubyEncoding encoding = Encodings.UTF_8;
+        RubyEncoding encoding = Encodings.FILESYSTEM;
         var path = TruffleString.fromByteArrayUncached(node.filepath, encoding.tencoding);
         var rubyNode = new StringLiteralNode(path, encoding);
         return assignPositionAndFlags(node, rubyNode);
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index 804f68b7f46d..be275a17aa3b 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -429,7 +429,7 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
         byte[] filepath;
         int line = rubySource.getLineOffset() + 1;
         byte[] encoding = StringOperations.encodeAsciiBytes(rubySource.getEncoding().toString()); // encoding name is supposed to contain only ASCII characters
-        boolean frozenStringLiteral = configuration.isFrozenStringLiteral();
+        boolean frozenStringLiteral = language.options.FROZEN_STRING_LITERALS;
         boolean verbose = true;
         // The vendored version of prism in CRuby 3.3.0
         // See pm_options_version_t in c/yarp/include/prism/options.h

From 7ae0112c330c8525da3d82e094f7ab45cbd02773 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Fri, 26 Jan 2024 18:42:04 +0100
Subject: [PATCH 085/131] Clarify

---
 .../java/org/truffleruby/parser/TranslatorEnvironment.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java b/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java
index 87b32155e5be..d2a73a2ec5f6 100644
--- a/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java
+++ b/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java
@@ -388,13 +388,13 @@ public TranslatorEnvironment getSurroundingMethodEnvironment() {
         return methodParent;
     }
 
-    /** Return either outer method/module/top level environment or in case of eval("...") the topmost environment of the
-     * parsed (by eval) code */
+    /** Return either outer method/module/top level environment or in case of eval("...") the outermost environment of
+     * the parsed (by eval) code */
     public TranslatorEnvironment getSurroundingMethodOrEvalEnvironment() {
         TranslatorEnvironment environment = this;
 
         // eval's parsing environment still has frameDescriptor not initialized,
-        // but all the outer scopes are related to already parsed code and have initialized frameDescriptor.
+        // but all the outer scopes are related to already parsed code and have frameDescriptor != null.
         while (environment.isBlock() && environment.getParent().frameDescriptor == null) {
             environment = environment.getParent();
         }

From 9b6f02fbe2803d189cf6b7edfea97bfed0ca3e87 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sat, 27 Jan 2024 13:47:58 +0100
Subject: [PATCH 086/131] Ignore node wrappers in
 RubyCallNode#getLastArgumentNode()

---
 .../org/truffleruby/language/dispatch/RubyCallNode.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java b/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java
index 75ac3f5d4396..f98006368d2b 100644
--- a/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java
+++ b/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java
@@ -283,7 +283,7 @@ private RubyNode getLastArgumentNode() {
 
         // BodyTranslator-specific condition
         if (isSplatted && lastArg instanceof ArrayAppendOneNode arrayAppendOneNode) {
-            return arrayAppendOneNode.getValueNode();
+            return RubyNode.unwrapNode(arrayAppendOneNode.getValueNode());
         }
 
         // YARP-specific condition
@@ -294,13 +294,13 @@ private RubyNode getLastArgumentNode() {
             RubyNode[] elements = arrayConcatNode.getElements();
             assert elements.length > 0;
 
-            RubyNode last = elements[elements.length - 1];
+            RubyNode last = RubyNode.unwrapNode(elements[elements.length - 1]);
 
             if (last instanceof ArrayLiteralNode arrayLiteralNode) {
                 RubyNode[] values = arrayLiteralNode.getValues();
                 assert values.length > 0;
 
-                return values[values.length - 1];
+                return RubyNode.unwrapNode(values[values.length - 1]);
             } else {
                 return last;
             }

From 298dbacac429e538e0ad218ff419e910ebcaec28 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sat, 27 Jan 2024 14:04:03 +0100
Subject: [PATCH 087/131] Allow Prism syntax error message for duplicated
 parameters in test_syntax.rb

* See https://github.com/ruby/prism/issues/2287
---
 test/mri/tests/ruby/test_syntax.rb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/mri/tests/ruby/test_syntax.rb b/test/mri/tests/ruby/test_syntax.rb
index 0d883cf56c73..45fa9a78697c 100644
--- a/test/mri/tests/ruby/test_syntax.rb
+++ b/test/mri/tests/ruby/test_syntax.rb
@@ -566,28 +566,28 @@ def test_cmdarg_kwarg_lvar_clashing_method
   end
 
   def test_duplicated_arg
-    assert_syntax_error("def foo(a, a) end", /duplicated argument name/)
+    assert_syntax_error("def foo(a, a) end", /duplicated argument name|repeated parameter name/)
     assert_valid_syntax("def foo(_, _) end")
     (obj = Object.new).instance_eval("def foo(_, x, _) x end")
     assert_equal(2, obj.foo(1, 2, 3))
   end
 
   def test_duplicated_rest
-    assert_syntax_error("def foo(a, *a) end", /duplicated argument name/)
+    assert_syntax_error("def foo(a, *a) end", /duplicated argument name|repeated parameter name/)
     assert_valid_syntax("def foo(_, *_) end")
     (obj = Object.new).instance_eval("def foo(_, x, *_) x end")
     assert_equal(2, obj.foo(1, 2, 3))
   end
 
   def test_duplicated_opt
-    assert_syntax_error("def foo(a, a=1) end", /duplicated argument name/)
+    assert_syntax_error("def foo(a, a=1) end", /duplicated argument name|repeated parameter name/)
     assert_valid_syntax("def foo(_, _=1) end")
     (obj = Object.new).instance_eval("def foo(_, x, _=42) x end")
     assert_equal(2, obj.foo(1, 2))
   end
 
   def test_duplicated_opt_rest
-    assert_syntax_error("def foo(a=1, *a) end", /duplicated argument name/)
+    assert_syntax_error("def foo(a=1, *a) end", /duplicated argument name|repeated parameter name/)
     assert_valid_syntax("def foo(_=1, *_) end")
     (obj = Object.new).instance_eval("def foo(_, x=42, *_) x end")
     assert_equal(42, obj.foo(1))
@@ -595,11 +595,11 @@ def test_duplicated_opt_rest
   end
 
   def test_duplicated_rest_opt
-    assert_syntax_error("def foo(*a, a=1) end", /duplicated argument name/)
+    assert_syntax_error("def foo(*a, a=1) end", /duplicated argument name|unexpected parameter order/)
   end
 
   def test_duplicated_rest_post
-    assert_syntax_error("def foo(*a, a) end", /duplicated argument name/)
+    assert_syntax_error("def foo(*a, a) end", /duplicated argument name|repeated parameter name/)
     assert_valid_syntax("def foo(*_, _) end")
     (obj = Object.new).instance_eval("def foo(*_, x, _) x end")
     assert_equal(2, obj.foo(1, 2, 3))
@@ -610,7 +610,7 @@ def test_duplicated_rest_post
   end
 
   def test_duplicated_opt_post
-    assert_syntax_error("def foo(a=1, a) end", /duplicated argument name/)
+    assert_syntax_error("def foo(a=1, a) end", /duplicated argument name|repeated parameter name/)
     assert_valid_syntax("def foo(_=1, _) end")
     (obj = Object.new).instance_eval("def foo(_=1, x, _) x end")
     assert_equal(2, obj.foo(1, 2, 3))
@@ -621,7 +621,7 @@ def test_duplicated_opt_post
   end
 
   def test_duplicated_kw
-    assert_syntax_error("def foo(a, a: 1) end", /duplicated argument name/)
+    assert_syntax_error("def foo(a, a: 1) end", /duplicated argument name|repeated parameter name/)
     assert_valid_syntax("def foo(_, _: 1) end")
     (obj = Object.new).instance_eval("def foo(_, x, _: 1) x end")
     assert_equal(3, obj.foo(2, 3))
@@ -632,7 +632,7 @@ def test_duplicated_kw
   end
 
   def test_duplicated_rest_kw
-    assert_syntax_error("def foo(*a, a: 1) end", /duplicated argument name/)
+    assert_syntax_error("def foo(*a, a: 1) end", /duplicated argument name|repeated parameter name/)
     assert_nothing_raised {def foo(*_, _: 1) end}
     (obj = Object.new).instance_eval("def foo(*_, x: 42, _: 1) x end")
     assert_equal(42, obj.foo(42))
@@ -641,7 +641,7 @@ def test_duplicated_rest_kw
   end
 
   def test_duplicated_opt_kw
-    assert_syntax_error("def foo(a=1, a: 1) end", /duplicated argument name/)
+    assert_syntax_error("def foo(a=1, a: 1) end", /duplicated argument name|repeated parameter name/)
     assert_valid_syntax("def foo(_=1, _: 1) end")
     (obj = Object.new).instance_eval("def foo(_=42, x, _: 1) x end")
     assert_equal(0, obj.foo(0))
@@ -649,7 +649,7 @@ def test_duplicated_opt_kw
   end
 
   def test_duplicated_kw_kwrest
-    assert_syntax_error("def foo(a: 1, **a) end", /duplicated argument name/)
+    assert_syntax_error("def foo(a: 1, **a) end", /duplicated argument name|repeated parameter name/)
     assert_valid_syntax("def foo(_: 1, **_) end")
     (obj = Object.new).instance_eval("def foo(_: 1, x: 42, **_) x end")
     assert_equal(42, obj.foo())
@@ -659,7 +659,7 @@ def test_duplicated_kw_kwrest
   end
 
   def test_duplicated_rest_kwrest
-    assert_syntax_error("def foo(*a, **a) end", /duplicated argument name/)
+    assert_syntax_error("def foo(*a, **a) end", /duplicated argument name|repeated parameter name/)
     assert_valid_syntax("def foo(*_, **_) end")
     (obj = Object.new).instance_eval("def foo(*_, x, **_) x end")
     assert_equal(1, obj.foo(1))
@@ -668,7 +668,7 @@ def test_duplicated_rest_kwrest
   end
 
   def test_duplicated_opt_kwrest
-    assert_syntax_error("def foo(a=1, **a) end", /duplicated argument name/)
+    assert_syntax_error("def foo(a=1, **a) end", /duplicated argument name|repeated parameter name/)
     assert_valid_syntax("def foo(_=1, **_) end")
     (obj = Object.new).instance_eval("def foo(_=42, x, **_) x end")
     assert_equal(1, obj.foo(1))

From e927a98d7837008ae25a83456b14e18fe460507f Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sat, 27 Jan 2024 14:10:20 +0100
Subject: [PATCH 088/131] Exclude failing test_syntax.rb due to different
 messages in Prism

---
 test/mri/excludes/TestSyntax.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/mri/excludes/TestSyntax.rb b/test/mri/excludes/TestSyntax.rb
index 2577f93e4d26..55596ef5ec43 100644
--- a/test/mri/excludes/TestSyntax.rb
+++ b/test/mri/excludes/TestSyntax.rb
@@ -61,3 +61,12 @@
 exclude :test_anonymous_keyword_rest_forwarding, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_syntax.rb:158:in `test_anonymous_keyword_rest_forwarding'."
 exclude :test_script_lines_encoding, "pid 42586 exit 0."
 exclude :test_class_module_Object_ancestors, "TypeError: 1:Integer is not a class"
+exclude :test_unassignable, "prism"
+exclude :test_anonymous_block_forwarding, "prism"
+exclude :test_newline_in_block_parameters, "prism"
+exclude :test_invalid_symbol_space, "prism"
+exclude :test_keywords_specified_and_not_accepted, "prism"
+exclude :test_unexpected_fraction, "prism"
+exclude :test_heredoc_cr, "prism"
+exclude :test_no_label_with_percent, "prism"
+exclude :test_keyword_duplicated, "prism"

From e1993494b3ac7a88218170e64b466168f46dc867 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sat, 27 Jan 2024 14:11:21 +0100
Subject: [PATCH 089/131] Exclude corner case heredoc test failing on Prism

---
 test/mri/excludes/TestSyntax.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/mri/excludes/TestSyntax.rb b/test/mri/excludes/TestSyntax.rb
index 55596ef5ec43..0e4d0a13802c 100644
--- a/test/mri/excludes/TestSyntax.rb
+++ b/test/mri/excludes/TestSyntax.rb
@@ -70,3 +70,4 @@
 exclude :test_heredoc_cr, "prism"
 exclude :test_no_label_with_percent, "prism"
 exclude :test_keyword_duplicated, "prism"
+exclude :test_dedented_heredoc_concatenation, "prism heredoc"

From 7aa76acc051d78a4878f4563773701a08a36a412 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sat, 27 Jan 2024 14:12:39 +0100
Subject: [PATCH 090/131] Exclude failing test_syntax.rb due to different
 messages in Prism

---
 test/mri/excludes/TestSyntax.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/mri/excludes/TestSyntax.rb b/test/mri/excludes/TestSyntax.rb
index 0e4d0a13802c..f785033670e1 100644
--- a/test/mri/excludes/TestSyntax.rb
+++ b/test/mri/excludes/TestSyntax.rb
@@ -71,3 +71,5 @@
 exclude :test_no_label_with_percent, "prism"
 exclude :test_keyword_duplicated, "prism"
 exclude :test_dedented_heredoc_concatenation, "prism heredoc"
+exclude :test_too_big_nth_ref, "prism"
+exclude :test_null_range_cmdarg, "prism"

From d150a48971524ea84148b1507578443a94473dec Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sat, 27 Jan 2024 14:22:54 +0100
Subject: [PATCH 091/131] Raise a proper SyntaxError for pattern matching until
 implemented

* The untagged spec is legitimately passing due to Prism returning the correct SyntaxError for it.
---
 spec/tags/language/pattern_matching_tags.txt             | 1 -
 src/main/java/org/truffleruby/parser/YARPTranslator.java | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/spec/tags/language/pattern_matching_tags.txt b/spec/tags/language/pattern_matching_tags.txt
index 35ac8d92481e..21d1e3107db7 100644
--- a/spec/tags/language/pattern_matching_tags.txt
+++ b/spec/tags/language/pattern_matching_tags.txt
@@ -1,7 +1,6 @@
 fails:Pattern matching variable pattern supports using any name with _ at the beginning in a pattern several times
 fails:Pattern matching variable pattern supports existing variables in a pattern specified with ^ operator
 fails:Pattern matching variable pattern allows applying ^ operator to bound variables
-fails:Pattern matching variable pattern requires bound variable to be specified in a pattern before ^ operator when it relies on a bound variable
 fails:Pattern matching alternative pattern matches if any of patterns matches
 fails:Pattern matching alternative pattern does not support variable binding
 fails:Pattern matching alternative pattern support underscore prefixed variables in alternation
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index cad0a1831738..cd0bce0c5981 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -959,7 +959,9 @@ public RubyNode visitCapturePatternNode(Nodes.CapturePatternNode node) {
 
     @Override
     public RubyNode visitCaseMatchNode(Nodes.CaseMatchNode node) {
-        return super.visitCaseMatchNode(node);
+        var context = RubyLanguage.getCurrentContext();
+        throw new RaiseException(context, context.getCoreExceptions()
+                .syntaxError("`case/in` pattern matching not yet implemented", currentNode, getSourceSection(node)));
     }
 
     @Override
@@ -2564,7 +2566,9 @@ public RubyNode visitMatchPredicateNode(Nodes.MatchPredicateNode node) {
 
     @Override
     public RubyNode visitMatchRequiredNode(Nodes.MatchRequiredNode node) {
-        return defaultVisit(node);
+        var context = RubyLanguage.getCurrentContext();
+        throw new RaiseException(context, context.getCoreExceptions()
+                .syntaxError("`=>` pattern matching not yet implemented", currentNode, getSourceSection(node)));
     }
 
     // See BodyTranslator#visitMatch2Node

From 681fccaa29224a85a306aea9fb681981e69fa93f Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sat, 27 Jan 2024 19:22:58 +0100
Subject: [PATCH 092/131] Import
 ruby/prism@d69b9da805d525c13a8d4386aea6bc0da8e6cf63

---
 src/main/c/yarp/Makefile                   |   6 +
 src/main/c/yarp/include/prism/ast.h        |  97 +++--
 src/main/c/yarp/include/prism/diagnostic.h |  24 ++
 src/main/c/yarp/src/diagnostic.c           | 478 +++++++++++----------
 src/main/c/yarp/src/node.c                 |   8 +-
 src/main/c/yarp/src/prettyprint.c          |  18 +-
 src/main/c/yarp/src/prism.c                | 283 +++++++-----
 src/main/c/yarp/src/serialize.c            |  10 +-
 src/main/c/yarp/src/util/pm_newline_list.c |   4 +-
 src/yarp/java/org/prism/Loader.java        |   8 +-
 src/yarp/java/org/prism/Nodes.java         | 174 +++++---
 src/yarp/java/org/prism/ParseResult.java   |  24 +-
 12 files changed, 698 insertions(+), 436 deletions(-)

diff --git a/src/main/c/yarp/Makefile b/src/main/c/yarp/Makefile
index 9e1417e5bac2..d2ded6de7bf3 100644
--- a/src/main/c/yarp/Makefile
+++ b/src/main/c/yarp/Makefile
@@ -12,6 +12,7 @@ SOEXT := $(shell ruby -e 'puts RbConfig::CONFIG["SOEXT"]')
 
 CPPFLAGS := -Iinclude
 CFLAGS := -g -O2 -std=c99 -Wall -Werror -Wextra -Wpedantic -Wundef -Wconversion -Wno-missing-braces -fPIC -fvisibility=hidden
+JAVA_WASM_CFLAGS := -O0 -g -o -std=c99 -Wall -Werror -Wextra -Wpedantic -Wundef -Wconversion -Wno-missing-braces -fPIC -fvisibility=hidden -nostartfiles -Wl,--no-entry -Wl,
 CC := cc
 WASI_SDK_PATH := /opt/wasi-sdk
 
@@ -25,6 +26,7 @@ all: shared static
 shared: build/libprism.$(SOEXT)
 static: build/libprism.a
 wasm: javascript/src/prism.wasm
+java-wasm: java-wasm/src/test/resources/prism.wasm
 
 build/libprism.$(SOEXT): $(SHARED_OBJECTS)
 	$(ECHO) "linking $@"
@@ -38,6 +40,10 @@ javascript/src/prism.wasm: Makefile $(SOURCES) $(HEADERS)
 	$(ECHO) "building $@"
 	$(Q) $(WASI_SDK_PATH)/bin/clang --sysroot=$(WASI_SDK_PATH)/share/wasi-sysroot/ $(DEBUG_FLAGS) -DPRISM_EXPORT_SYMBOLS -D_WASI_EMULATED_MMAN -lwasi-emulated-mman $(CPPFLAGS) $(CFLAGS) -Wl,--export-all -Wl,--no-entry -mexec-model=reactor -o $@ $(SOURCES)
 
+java-wasm/src/test/resources/prism.wasm: Makefile $(SOURCES) $(HEADERS)
+	$(ECHO) "building $@"
+	$(Q) $(WASI_SDK_PATH)/bin/clang $(DEBUG_FLAGS) -DPRISM_EXPORT_SYMBOLS -D_WASI_EMULATED_MMAN -lwasi-emulated-mman $(CPPFLAGS) $(JAVA_WASM_CFLAGS) -Wl,--export-all -Wl,--no-entry -mexec-model=reactor -lc++ -lc++abi -o $@ $(SOURCES)
+
 build/shared/%.o: src/%.c Makefile $(HEADERS)
 	$(ECHO) "compiling $@"
 	$(Q) mkdir -p $(@D)
diff --git a/src/main/c/yarp/include/prism/ast.h b/src/main/c/yarp/include/prism/ast.h
index d212c724b611..8697f576e63c 100644
--- a/src/main/c/yarp/include/prism/ast.h
+++ b/src/main/c/yarp/include/prism/ast.h
@@ -1173,8 +1173,7 @@ typedef struct pm_and_node {
     /**
      * AndNode#left
      *
-     * Represents the left side of the expression. It can be any kind of node
-     * that represents a non-void expression.
+     * Represents the left side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
      *
      *     left and right
      *     ^^^^
@@ -1187,8 +1186,7 @@ typedef struct pm_and_node {
     /**
      * AndNode#right
      *
-     * Represents the right side of the expression. It can be any kind of
-     * node that represents a non-void expression.
+     * Represents the right side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
      *
      *     left && right
      *             ^^^^^
@@ -1313,8 +1311,7 @@ typedef struct pm_assoc_node {
     /**
      * AssocNode#key
      *
-     * The key of the association. This can be any node that represents a
-     * non-void expression.
+     * The key of the association. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
      *
      *     { a: b }
      *       ^
@@ -1330,9 +1327,7 @@ typedef struct pm_assoc_node {
     /**
      * AssocNode#value
      *
-     * The value of the association, if present. This can be any node that
-     * represents a non-void expression. It can be optionally omitted if this
-     * node is an element in a `HashPatternNode`.
+     * The value of the association, if present. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
      *
      *     { foo => bar }
      *              ^^^
@@ -1367,8 +1362,7 @@ typedef struct pm_assoc_splat_node {
     /**
      * AssocSplatNode#value
      *
-     * The value to be splatted, if present. Will be missing when keyword
-     * rest argument forwarding is used.
+     * The value to be splatted, if present. Will be missing when keyword rest argument forwarding is used.
      *
      *     { **foo }
      *         ^^^
@@ -1399,6 +1393,12 @@ typedef struct pm_back_reference_read_node {
 
     /**
      * BackReferenceReadNode#name
+     *
+     * The name of the back-reference variable, including the leading `$`.
+     *
+     *     $& # name `:$&`
+     *
+     *     $+ # name `:$+`
      */
     pm_constant_id_t name;
 } pm_back_reference_read_node_t;
@@ -1682,9 +1682,7 @@ typedef struct pm_call_node {
     /**
      * CallNode#receiver
      *
-     * The object that the method is being called on. This can be either
-     * `nil` or a node representing any kind of expression that returns a
-     * non-void value.
+     * The object that the method is being called on. This can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
      *
      *     foo.bar
      *     ^^^
@@ -2146,6 +2144,12 @@ typedef struct pm_class_variable_read_node {
 
     /**
      * ClassVariableReadNode#name
+     *
+     * The name of the class variable, which is a `@@` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+     *
+     *     @@abc   # name `:@@abc`
+     *
+     *     @@_test # name `:@@_test`
      */
     pm_constant_id_t name;
 } pm_class_variable_read_node_t;
@@ -2480,6 +2484,12 @@ typedef struct pm_constant_read_node {
 
     /**
      * ConstantReadNode#name
+     *
+     * The name of the [constant](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#constants).
+     *
+     *     X              # name `:X`
+     *
+     *     SOME_CONSTANT  # name `:SOME_CONSTANT`
      */
     pm_constant_id_t name;
 } pm_constant_read_node_t;
@@ -3042,6 +3052,12 @@ typedef struct pm_global_variable_read_node {
 
     /**
      * GlobalVariableReadNode#name
+     *
+     * The name of the global variable, which is a `$` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifier). Alternatively, it can be one of the special global variables designated by a symbol.
+     *
+     *     $foo   # name `:$foo`
+     *
+     *     $_Test # name `:$_Test`
      */
     pm_constant_id_t name;
 } pm_global_variable_read_node_t;
@@ -3629,6 +3645,12 @@ typedef struct pm_instance_variable_read_node {
 
     /**
      * InstanceVariableReadNode#name
+     *
+     * The name of the instance variable, which is a `@` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+     *
+     *     @x     # name `:@x`
+     *
+     *     @_test # name `:@_test`
      */
     pm_constant_id_t name;
 } pm_instance_variable_read_node_t;
@@ -4082,11 +4104,33 @@ typedef struct pm_local_variable_read_node {
 
     /**
      * LocalVariableReadNode#name
+     *
+     * The name of the local variable, which is an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+     *
+     *     x      # name `:x`
+     *
+     *     _Test  # name `:_Test`
+     *
+     * Note that this can also be an underscore followed by a number for the default block parameters.
+     *
+     *     _1     # name `:_1`
+     *
+     * Finally, for the default `it` block parameter, the name is `0it`. This is to distinguish it from an `it` local variable that is explicitly declared.
+     *
+     *     it     # name `:0it`
      */
     pm_constant_id_t name;
 
     /**
      * LocalVariableReadNode#depth
+     *
+     * The number of visible scopes that should be searched to find the origin of this local variable.
+     *
+     *     foo = 1; foo # depth 0
+     *
+     *     bar = 2; tap { bar } # depth 1
+     *
+     * The specific rules for calculating the depth may differ from individual Ruby implementations, as they are not specified by the language. For more information, see [the Prism documentation](https://github.com/ruby/prism/blob/main/docs/local_variable_depth.md).
      */
     uint32_t depth;
 } pm_local_variable_read_node_t;
@@ -4494,6 +4538,14 @@ typedef struct pm_numbered_reference_read_node {
 
     /**
      * NumberedReferenceReadNode#number
+     *
+     * The (1-indexed, from the left) number of the capture group. Numbered references that would overflow a `uint32`  result in a `number` of exactly `2**32 - 1`.
+     *
+     *     $1          # number `1`
+     *
+     *     $5432       # number `5432`
+     *
+     *     $4294967296 # number `4294967295`
      */
     uint32_t number;
 } pm_numbered_reference_read_node_t;
@@ -4575,8 +4627,7 @@ typedef struct pm_or_node {
     /**
      * OrNode#left
      *
-     * Represents the left side of the expression. It can be any kind of node
-     * that represents a non-void expression.
+     * Represents the left side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
      *
      *     left or right
      *     ^^^^
@@ -4589,8 +4640,7 @@ typedef struct pm_or_node {
     /**
      * OrNode#right
      *
-     * Represents the right side of the expression. It can be any kind of
-     * node that represents a non-void expression.
+     * Represents the right side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
      *
      *     left || right
      *             ^^^^^
@@ -4841,9 +4891,7 @@ typedef struct pm_range_node {
     /**
      * RangeNode#left
      *
-     * The left-hand side of the range, if present. Can be either `nil` or
-     * a node representing any kind of expression that returns a non-void
-     * value.
+     * The left-hand side of the range, if present. It can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
      *
      *     1...
      *     ^
@@ -4856,17 +4904,14 @@ typedef struct pm_range_node {
     /**
      * RangeNode#right
      *
-     * The right-hand side of the range, if present. Can be either `nil` or
-     * a node representing any kind of expression that returns a non-void
-     * value.
+     * The right-hand side of the range, if present. It can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
      *
      *     ..5
      *       ^
      *
      *     1...foo
      *         ^^^
-     * If neither right-hand or left-hand side was included, this will be a
-     * MissingNode.
+     * If neither right-hand or left-hand side was included, this will be a MissingNode.
      */
     struct pm_node *right;
 
diff --git a/src/main/c/yarp/include/prism/diagnostic.h b/src/main/c/yarp/include/prism/diagnostic.h
index fb4110236151..9b600208aeac 100644
--- a/src/main/c/yarp/include/prism/diagnostic.h
+++ b/src/main/c/yarp/include/prism/diagnostic.h
@@ -14,6 +14,24 @@
 #include 
 #include 
 
+/**
+ * The levels of errors generated during parsing.
+ */
+typedef enum {
+    /** For errors that cannot be recovered from. */
+    PM_ERROR_LEVEL_FATAL = 0
+} pm_error_level_t;
+
+/**
+ * The levels of warnings generated during parsing.
+ */
+typedef enum {
+    /** For warnings which should be emitted if $VERBOSE != nil. */
+    PM_WARNING_LEVEL_DEFAULT = 0,
+    /** For warnings which should be emitted if $VERBOSE == true. */
+    PM_WARNING_LEVEL_VERBOSE = 1
+} pm_warning_level_t;
+
 /**
  * This struct represents a diagnostic generated during parsing.
  *
@@ -35,6 +53,12 @@ typedef struct {
      * diagnostic is freed.
      */
     bool owned;
+
+    /**
+     * The level of the diagnostic, see `pm_error_level_t` and
+     * `pm_warning_level_t` for possible values.
+     */
+    uint8_t level;
 } pm_diagnostic_t;
 
 /**
diff --git a/src/main/c/yarp/src/diagnostic.c b/src/main/c/yarp/src/diagnostic.c
index ed47a1cdade0..3ff4a933c645 100644
--- a/src/main/c/yarp/src/diagnostic.c
+++ b/src/main/c/yarp/src/diagnostic.c
@@ -1,5 +1,14 @@
 #include "prism/diagnostic.h"
 
+/** This struct holds the data for each diagnostic. */
+typedef struct {
+    /** The message associated with the diagnostic. */
+    const char* message;
+
+    /** The level associated with the diagnostic. */
+    uint8_t level;
+} pm_diagnostic_data_t;
+
 /**
  * ## Message composition
  *
@@ -49,238 +58,259 @@
  *   - e.g., "INVALID_NUMBER_DECIMAL" is better than "DECIMAL_INVALID_NUMBER".
  *   - When in doubt, look for similar patterns and name them so that they are grouped when lexically
  *     sorted. See PM_ERR_ARGUMENT_NO_FORWARDING_* for an example.
+ *
+ * ## Level
+ *
+ * For errors, they are:
+ *
+ * * `PM_ERROR_LEVEL_FATAL` - The level for all errors.
+ *
+ * For warnings, they are:
+ *
+ * * `PM_WARNING_LEVEL_DEFAULT` - Warnings that appear for `ruby -c -e 'code'`.
+ * * `PM_WARNING_LEVEL_VERBOSE` - Warnings that appear with `-w`, as in `ruby -w -c -e 'code'`.
  */
-static const char* const diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
-    [PM_ERR_ALIAS_ARGUMENT]                     = "invalid argument being passed to `alias`; expected a bare word, symbol, constant, or global variable",
-    [PM_ERR_AMPAMPEQ_MULTI_ASSIGN]              = "unexpected `&&=` in a multiple assignment",
-    [PM_ERR_ARGUMENT_AFTER_BLOCK]               = "unexpected argument after a block argument",
-    [PM_ERR_ARGUMENT_AFTER_FORWARDING_ELLIPSES] = "unexpected argument after `...`",
-    [PM_ERR_ARGUMENT_BARE_HASH]                 = "unexpected bare hash argument",
-    [PM_ERR_ARGUMENT_BLOCK_FORWARDING]          = "both a block argument and a forwarding argument; only one block is allowed",
-    [PM_ERR_ARGUMENT_BLOCK_MULTI]               = "multiple block arguments; only one block is allowed",
-    [PM_ERR_ARGUMENT_FORMAL_CLASS]              = "invalid formal argument; formal argument cannot be a class variable",
-    [PM_ERR_ARGUMENT_FORMAL_CONSTANT]           = "invalid formal argument; formal argument cannot be a constant",
-    [PM_ERR_ARGUMENT_FORMAL_GLOBAL]             = "invalid formal argument; formal argument cannot be a global variable",
-    [PM_ERR_ARGUMENT_FORMAL_IVAR]               = "invalid formal argument; formal argument cannot be an instance variable",
-    [PM_ERR_ARGUMENT_FORWARDING_UNBOUND]        = "unexpected `...` in an non-parenthesized call",
-    [PM_ERR_ARGUMENT_IN]                        = "unexpected `in` keyword in arguments",
-    [PM_ERR_ARGUMENT_NO_FORWARDING_AMP]         = "unexpected `&` when the parent method is not forwarding",
-    [PM_ERR_ARGUMENT_NO_FORWARDING_ELLIPSES]    = "unexpected `...` when the parent method is not forwarding",
-    [PM_ERR_ARGUMENT_NO_FORWARDING_STAR]        = "unexpected `*` when the parent method is not forwarding",
-    [PM_ERR_ARGUMENT_SPLAT_AFTER_ASSOC_SPLAT]   = "unexpected `*` splat argument after a `**` keyword splat argument",
-    [PM_ERR_ARGUMENT_SPLAT_AFTER_SPLAT]         = "unexpected `*` splat argument after a `*` splat argument",
-    [PM_ERR_ARGUMENT_TERM_PAREN]                = "expected a `)` to close the arguments",
-    [PM_ERR_ARGUMENT_UNEXPECTED_BLOCK]          = "unexpected `{` after a method call without parenthesis",
-    [PM_ERR_ARRAY_ELEMENT]                      = "expected an element for the array",
-    [PM_ERR_ARRAY_EXPRESSION]                   = "expected an expression for the array element",
-    [PM_ERR_ARRAY_EXPRESSION_AFTER_STAR]        = "expected an expression after `*` in the array",
-    [PM_ERR_ARRAY_SEPARATOR]                    = "expected a `,` separator for the array elements",
-    [PM_ERR_ARRAY_TERM]                         = "expected a `]` to close the array",
-    [PM_ERR_BEGIN_LONELY_ELSE]                  = "unexpected `else` in `begin` block; a `rescue` clause must precede `else`",
-    [PM_ERR_BEGIN_TERM]                         = "expected an `end` to close the `begin` statement",
-    [PM_ERR_BEGIN_UPCASE_BRACE]                 = "expected a `{` after `BEGIN`",
-    [PM_ERR_BEGIN_UPCASE_TERM]                  = "expected a `}` to close the `BEGIN` statement",
-    [PM_ERR_BEGIN_UPCASE_TOPLEVEL]              = "BEGIN is permitted only at toplevel",
-    [PM_ERR_BLOCK_PARAM_LOCAL_VARIABLE]         = "expected a local variable name in the block parameters",
-    [PM_ERR_BLOCK_PARAM_PIPE_TERM]              = "expected the block parameters to end with `|`",
-    [PM_ERR_BLOCK_TERM_BRACE]                   = "expected a block beginning with `{` to end with `}`",
-    [PM_ERR_BLOCK_TERM_END]                     = "expected a block beginning with `do` to end with `end`",
-    [PM_ERR_CANNOT_PARSE_EXPRESSION]            = "cannot parse the expression",
-    [PM_ERR_CANNOT_PARSE_STRING_PART]           = "cannot parse the string part",
-    [PM_ERR_CASE_EXPRESSION_AFTER_CASE]         = "expected an expression after `case`",
-    [PM_ERR_CASE_EXPRESSION_AFTER_WHEN]         = "expected an expression after `when`",
-    [PM_ERR_CASE_MATCH_MISSING_PREDICATE]       = "expected a predicate for a case matching statement",
-    [PM_ERR_CASE_MISSING_CONDITIONS]            = "expected a `when` or `in` clause after `case`",
-    [PM_ERR_CASE_TERM]                          = "expected an `end` to close the `case` statement",
-    [PM_ERR_CLASS_IN_METHOD]                    = "unexpected class definition in a method definition",
-    [PM_ERR_CLASS_NAME]                         = "expected a constant name after `class`",
-    [PM_ERR_CLASS_SUPERCLASS]                   = "expected a superclass after `<`",
-    [PM_ERR_CLASS_TERM]                         = "expected an `end` to close the `class` statement",
-    [PM_ERR_CLASS_UNEXPECTED_END]               = "unexpected `end`, expecting ';' or '\\n'",
-    [PM_ERR_CONDITIONAL_ELSIF_PREDICATE]        = "expected a predicate expression for the `elsif` statement",
-    [PM_ERR_CONDITIONAL_IF_PREDICATE]           = "expected a predicate expression for the `if` statement",
-    [PM_ERR_CONDITIONAL_PREDICATE_TERM]         = "expected `then` or `;` or '\\n'",
-    [PM_ERR_CONDITIONAL_TERM]                   = "expected an `end` to close the conditional clause",
-    [PM_ERR_CONDITIONAL_TERM_ELSE]              = "expected an `end` to close the `else` clause",
-    [PM_ERR_CONDITIONAL_UNLESS_PREDICATE]       = "expected a predicate expression for the `unless` statement",
-    [PM_ERR_CONDITIONAL_UNTIL_PREDICATE]        = "expected a predicate expression for the `until` statement",
-    [PM_ERR_CONDITIONAL_WHILE_PREDICATE]        = "expected a predicate expression for the `while` statement",
-    [PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT] = "expected a constant after the `::` operator",
-    [PM_ERR_DEF_ENDLESS]                        = "could not parse the endless method body",
-    [PM_ERR_DEF_ENDLESS_SETTER]                 = "invalid method name; a setter method cannot be defined in an endless method definition",
-    [PM_ERR_DEF_NAME]                           = "expected a method name",
-    [PM_ERR_DEF_NAME_AFTER_RECEIVER]            = "expected a method name after the receiver",
-    [PM_ERR_DEF_PARAMS_TERM]                    = "expected a delimiter to close the parameters",
-    [PM_ERR_DEF_PARAMS_TERM_PAREN]              = "expected a `)` to close the parameters",
-    [PM_ERR_DEF_RECEIVER]                       = "expected a receiver for the method definition",
-    [PM_ERR_DEF_RECEIVER_TERM]                  = "expected a `.` or `::` after the receiver in a method definition",
-    [PM_ERR_DEF_TERM]                           = "expected an `end` to close the `def` statement",
-    [PM_ERR_DEFINED_EXPRESSION]                 = "expected an expression after `defined?`",
-    [PM_ERR_EMBDOC_TERM]                        = "could not find a terminator for the embedded document",
-    [PM_ERR_EMBEXPR_END]                        = "expected a `}` to close the embedded expression",
-    [PM_ERR_EMBVAR_INVALID]                     = "invalid embedded variable",
-    [PM_ERR_END_UPCASE_BRACE]                   = "expected a `{` after `END`",
-    [PM_ERR_END_UPCASE_TERM]                    = "expected a `}` to close the `END` statement",
-    [PM_ERR_ESCAPE_INVALID_CONTROL]             = "invalid control escape sequence",
-    [PM_ERR_ESCAPE_INVALID_CONTROL_REPEAT]      = "invalid control escape sequence; control cannot be repeated",
-    [PM_ERR_ESCAPE_INVALID_HEXADECIMAL]         = "invalid hexadecimal escape sequence",
-    [PM_ERR_ESCAPE_INVALID_META]                = "invalid meta escape sequence",
-    [PM_ERR_ESCAPE_INVALID_META_REPEAT]         = "invalid meta escape sequence; meta cannot be repeated",
-    [PM_ERR_ESCAPE_INVALID_UNICODE]             = "invalid Unicode escape sequence",
-    [PM_ERR_ESCAPE_INVALID_UNICODE_CM_FLAGS]    = "invalid Unicode escape sequence; Unicode cannot be combined with control or meta flags",
-    [PM_ERR_ESCAPE_INVALID_UNICODE_LITERAL]     = "invalid Unicode escape sequence; multiple codepoints are not allowed in a character literal",
-    [PM_ERR_ESCAPE_INVALID_UNICODE_LONG]        = "invalid Unicode escape sequence; maximum length is 6 digits",
-    [PM_ERR_ESCAPE_INVALID_UNICODE_TERM]        = "invalid Unicode escape sequence; needs closing `}`",
-    [PM_ERR_EXPECT_ARGUMENT]                    = "expected an argument",
-    [PM_ERR_EXPECT_EOL_AFTER_STATEMENT]         = "expected a newline or semicolon after the statement",
-    [PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ]   = "expected an expression after `&&=`",
-    [PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ] = "expected an expression after `||=`",
-    [PM_ERR_EXPECT_EXPRESSION_AFTER_COMMA]      = "expected an expression after `,`",
-    [PM_ERR_EXPECT_EXPRESSION_AFTER_EQUAL]      = "expected an expression after `=`",
-    [PM_ERR_EXPECT_EXPRESSION_AFTER_LESS_LESS]  = "expected an expression after `<<`",
-    [PM_ERR_EXPECT_EXPRESSION_AFTER_LPAREN]     = "expected an expression after `(`",
-    [PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR]   = "expected an expression after the operator",
-    [PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT]      = "expected an expression after `*` splat in an argument",
-    [PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT_HASH] = "expected an expression after `**` in a hash",
-    [PM_ERR_EXPECT_EXPRESSION_AFTER_STAR]       = "expected an expression after `*`",
-    [PM_ERR_EXPECT_IDENT_REQ_PARAMETER]         = "expected an identifier for the required parameter",
-    [PM_ERR_EXPECT_LPAREN_REQ_PARAMETER]        = "expected a `(` to start a required parameter",
-    [PM_ERR_EXPECT_RBRACKET]                    = "expected a matching `]`",
-    [PM_ERR_EXPECT_RPAREN]                      = "expected a matching `)`",
-    [PM_ERR_EXPECT_RPAREN_AFTER_MULTI]          = "expected a `)` after multiple assignment",
-    [PM_ERR_EXPECT_RPAREN_REQ_PARAMETER]        = "expected a `)` to end a required parameter",
-    [PM_ERR_EXPECT_STRING_CONTENT]              = "expected string content after opening string delimiter",
-    [PM_ERR_EXPECT_WHEN_DELIMITER]              = "expected a delimiter after the predicates of a `when` clause",
-    [PM_ERR_EXPRESSION_BARE_HASH]               = "unexpected bare hash in expression",
-    [PM_ERR_FOR_COLLECTION]                     = "expected a collection after the `in` in a `for` statement",
-    [PM_ERR_FOR_INDEX]                          = "expected an index after `for`",
-    [PM_ERR_FOR_IN]                             = "expected an `in` after the index in a `for` statement",
-    [PM_ERR_FOR_TERM]                           = "expected an `end` to close the `for` loop",
-    [PM_ERR_HASH_EXPRESSION_AFTER_LABEL]        = "expected an expression after the label in a hash",
-    [PM_ERR_HASH_KEY]                           = "expected a key in the hash literal",
-    [PM_ERR_HASH_ROCKET]                        = "expected a `=>` between the hash key and value",
-    [PM_ERR_HASH_TERM]                          = "expected a `}` to close the hash literal",
-    [PM_ERR_HASH_VALUE]                         = "expected a value in the hash literal",
-    [PM_ERR_HEREDOC_TERM]                       = "could not find a terminator for the heredoc",
-    [PM_ERR_INCOMPLETE_QUESTION_MARK]           = "incomplete expression at `?`",
-    [PM_ERR_INCOMPLETE_VARIABLE_CLASS]          = "incomplete class variable",
-    [PM_ERR_INCOMPLETE_VARIABLE_INSTANCE]       = "incomplete instance variable",
-    [PM_ERR_INVALID_ENCODING_MAGIC_COMMENT]     = "unknown or invalid encoding in the magic comment",
-    [PM_ERR_INVALID_FLOAT_EXPONENT]             = "invalid exponent",
-    [PM_ERR_INVALID_NUMBER_BINARY]              = "invalid binary number",
-    [PM_ERR_INVALID_NUMBER_DECIMAL]             = "invalid decimal number",
-    [PM_ERR_INVALID_NUMBER_HEXADECIMAL]         = "invalid hexadecimal number",
-    [PM_ERR_INVALID_NUMBER_OCTAL]               = "invalid octal number",
-    [PM_ERR_INVALID_NUMBER_UNDERSCORE]          = "invalid underscore placement in number",
-    [PM_ERR_INVALID_PERCENT]                    = "invalid `%` token", // TODO WHAT?
-    [PM_ERR_INVALID_TOKEN]                      = "invalid token", // TODO WHAT?
-    [PM_ERR_INVALID_VARIABLE_GLOBAL]            = "invalid global variable",
-    [PM_ERR_IT_NOT_ALLOWED]                     = "`it` is not allowed when an ordinary parameter is defined",
-    [PM_ERR_LAMBDA_OPEN]                        = "expected a `do` keyword or a `{` to open the lambda block",
-    [PM_ERR_LAMBDA_TERM_BRACE]                  = "expected a lambda block beginning with `{` to end with `}`",
-    [PM_ERR_LAMBDA_TERM_END]                    = "expected a lambda block beginning with `do` to end with `end`",
-    [PM_ERR_LIST_I_LOWER_ELEMENT]               = "expected a symbol in a `%i` list",
-    [PM_ERR_LIST_I_LOWER_TERM]                  = "expected a closing delimiter for the `%i` list",
-    [PM_ERR_LIST_I_UPPER_ELEMENT]               = "expected a symbol in a `%I` list",
-    [PM_ERR_LIST_I_UPPER_TERM]                  = "expected a closing delimiter for the `%I` list",
-    [PM_ERR_LIST_W_LOWER_ELEMENT]               = "expected a string in a `%w` list",
-    [PM_ERR_LIST_W_LOWER_TERM]                  = "expected a closing delimiter for the `%w` list",
-    [PM_ERR_LIST_W_UPPER_ELEMENT]               = "expected a string in a `%W` list",
-    [PM_ERR_LIST_W_UPPER_TERM]                  = "expected a closing delimiter for the `%W` list",
-    [PM_ERR_MALLOC_FAILED]                      = "failed to allocate memory",
-    [PM_ERR_MIXED_ENCODING]                     = "UTF-8 mixed within %s source",
-    [PM_ERR_MODULE_IN_METHOD]                   = "unexpected module definition in a method definition",
-    [PM_ERR_MODULE_NAME]                        = "expected a constant name after `module`",
-    [PM_ERR_MODULE_TERM]                        = "expected an `end` to close the `module` statement",
-    [PM_ERR_MULTI_ASSIGN_MULTI_SPLATS]          = "multiple splats in multiple assignment",
-    [PM_ERR_NOT_EXPRESSION]                     = "expected an expression after `not`",
-    [PM_ERR_NO_LOCAL_VARIABLE]                  = "%.*s: no such local variable",
-    [PM_ERR_NUMBER_LITERAL_UNDERSCORE]          = "number literal ending with a `_`",
-    [PM_ERR_NUMBERED_PARAMETER_NOT_ALLOWED]     = "numbered parameters are not allowed when an ordinary parameter is defined",
-    [PM_ERR_NUMBERED_PARAMETER_OUTER_SCOPE]     = "numbered parameter is already used in outer scope",
-    [PM_ERR_OPERATOR_MULTI_ASSIGN]              = "unexpected operator for a multiple assignment",
-    [PM_ERR_OPERATOR_WRITE_ARGUMENTS]           = "unexpected operator after a call with arguments",
-    [PM_ERR_OPERATOR_WRITE_BLOCK]               = "unexpected operator after a call with a block",
-    [PM_ERR_PARAMETER_ASSOC_SPLAT_MULTI]        = "unexpected multiple `**` splat parameters",
-    [PM_ERR_PARAMETER_BLOCK_MULTI]              = "multiple block parameters; only one block is allowed",
-    [PM_ERR_PARAMETER_CIRCULAR]                 = "parameter default value references itself",
-    [PM_ERR_PARAMETER_METHOD_NAME]              = "unexpected name for a parameter",
-    [PM_ERR_PARAMETER_NAME_REPEAT]              = "repeated parameter name",
-    [PM_ERR_PARAMETER_NO_DEFAULT]               = "expected a default value for the parameter",
-    [PM_ERR_PARAMETER_NO_DEFAULT_KW]            = "expected a default value for the keyword parameter",
-    [PM_ERR_PARAMETER_NUMBERED_RESERVED]        = "%.2s is reserved for numbered parameters",
-    [PM_ERR_PARAMETER_ORDER]                    = "unexpected parameter order",
-    [PM_ERR_PARAMETER_SPLAT_MULTI]              = "unexpected multiple `*` splat parameters",
-    [PM_ERR_PARAMETER_STAR]                     = "unexpected parameter `*`",
-    [PM_ERR_PARAMETER_UNEXPECTED_FWD]           = "unexpected `...` in parameters",
-    [PM_ERR_PARAMETER_WILD_LOOSE_COMMA]         = "unexpected `,` in parameters",
-    [PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET]   = "expected a pattern expression after the `[` operator",
-    [PM_ERR_PATTERN_EXPRESSION_AFTER_COMMA]     = "expected a pattern expression after `,`",
-    [PM_ERR_PATTERN_EXPRESSION_AFTER_HROCKET]   = "expected a pattern expression after `=>`",
-    [PM_ERR_PATTERN_EXPRESSION_AFTER_IN]        = "expected a pattern expression after the `in` keyword",
-    [PM_ERR_PATTERN_EXPRESSION_AFTER_KEY]       = "expected a pattern expression after the key",
-    [PM_ERR_PATTERN_EXPRESSION_AFTER_PAREN]     = "expected a pattern expression after the `(` operator",
-    [PM_ERR_PATTERN_EXPRESSION_AFTER_PIN]       = "expected a pattern expression after the `^` pin operator",
-    [PM_ERR_PATTERN_EXPRESSION_AFTER_PIPE]      = "expected a pattern expression after the `|` operator",
-    [PM_ERR_PATTERN_EXPRESSION_AFTER_RANGE]     = "expected a pattern expression after the range operator",
-    [PM_ERR_PATTERN_EXPRESSION_AFTER_REST]      = "unexpected pattern expression after the `**` expression",
-    [PM_ERR_PATTERN_HASH_KEY]                   = "expected a key in the hash pattern",
-    [PM_ERR_PATTERN_HASH_KEY_LABEL]             = "expected a label as the key in the hash pattern", // TODO // THIS // AND // ABOVE // IS WEIRD
-    [PM_ERR_PATTERN_IDENT_AFTER_HROCKET]        = "expected an identifier after the `=>` operator",
-    [PM_ERR_PATTERN_LABEL_AFTER_COMMA]          = "expected a label after the `,` in the hash pattern",
-    [PM_ERR_PATTERN_REST]                       = "unexpected rest pattern",
-    [PM_ERR_PATTERN_TERM_BRACE]                 = "expected a `}` to close the pattern expression",
-    [PM_ERR_PATTERN_TERM_BRACKET]               = "expected a `]` to close the pattern expression",
-    [PM_ERR_PATTERN_TERM_PAREN]                 = "expected a `)` to close the pattern expression",
-    [PM_ERR_PIPEPIPEEQ_MULTI_ASSIGN]            = "unexpected `||=` in a multiple assignment",
-    [PM_ERR_REGEXP_TERM]                        = "expected a closing delimiter for the regular expression",
-    [PM_ERR_RESCUE_EXPRESSION]                  = "expected a rescued expression",
-    [PM_ERR_RESCUE_MODIFIER_VALUE]              = "expected a value after the `rescue` modifier",
-    [PM_ERR_RESCUE_TERM]                        = "expected a closing delimiter for the `rescue` clause",
-    [PM_ERR_RESCUE_VARIABLE]                    = "expected an exception variable after `=>` in a rescue statement",
-    [PM_ERR_RETURN_INVALID]                     = "invalid `return` in a class or module body",
-    [PM_ERR_STATEMENT_ALIAS]                    = "unexpected an `alias` at a non-statement position",
-    [PM_ERR_STATEMENT_POSTEXE_END]              = "unexpected an `END` at a non-statement position",
-    [PM_ERR_STATEMENT_PREEXE_BEGIN]             = "unexpected a `BEGIN` at a non-statement position",
-    [PM_ERR_STATEMENT_UNDEF]                    = "unexpected an `undef` at a non-statement position",
-    [PM_ERR_STRING_CONCATENATION]               = "expected a string for concatenation",
-    [PM_ERR_STRING_INTERPOLATED_TERM]           = "expected a closing delimiter for the interpolated string",
-    [PM_ERR_STRING_LITERAL_TERM]                = "expected a closing delimiter for the string literal",
-    [PM_ERR_SYMBOL_INVALID]                     = "invalid symbol", // TODO expected symbol? prism.c ~9719
-    [PM_ERR_SYMBOL_TERM_DYNAMIC]                = "expected a closing delimiter for the dynamic symbol",
-    [PM_ERR_SYMBOL_TERM_INTERPOLATED]           = "expected a closing delimiter for the interpolated symbol",
-    [PM_ERR_TERNARY_COLON]                      = "expected a `:` after the true expression of a ternary operator",
-    [PM_ERR_TERNARY_EXPRESSION_FALSE]           = "expected an expression after `:` in the ternary operator",
-    [PM_ERR_TERNARY_EXPRESSION_TRUE]            = "expected an expression after `?` in the ternary operator",
-    [PM_ERR_UNDEF_ARGUMENT]                     = "invalid argument being passed to `undef`; expected a bare word, constant, or symbol argument",
-    [PM_ERR_UNARY_RECEIVER_BANG]                = "expected a receiver for unary `!`",
-    [PM_ERR_UNARY_RECEIVER_MINUS]               = "expected a receiver for unary `-`",
-    [PM_ERR_UNARY_RECEIVER_PLUS]                = "expected a receiver for unary `+`",
-    [PM_ERR_UNARY_RECEIVER_TILDE]               = "expected a receiver for unary `~`",
-    [PM_ERR_UNTIL_TERM]                         = "expected an `end` to close the `until` statement",
-    [PM_ERR_VOID_EXPRESSION]                    = "unexpected void value expression",
-    [PM_ERR_WHILE_TERM]                         = "expected an `end` to close the `while` statement",
-    [PM_ERR_WRITE_TARGET_IN_METHOD]             = "dynamic constant assignment",
-    [PM_ERR_WRITE_TARGET_READONLY]              = "immutable variable as a write target",
-    [PM_ERR_WRITE_TARGET_UNEXPECTED]            = "unexpected write target",
-    [PM_ERR_XSTRING_TERM]                       = "expected a closing delimiter for the `%x` or backtick string",
-    [PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_MINUS]    = "ambiguous first argument; put parentheses or a space even after `-` operator",
-    [PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_PLUS]     = "ambiguous first argument; put parentheses or a space even after `+` operator",
-    [PM_WARN_AMBIGUOUS_PREFIX_STAR]             = "ambiguous `*` has been interpreted as an argument prefix",
-    [PM_WARN_AMBIGUOUS_SLASH]                   = "ambiguous `/`; wrap regexp in parentheses or add a space after `/` operator",
-    [PM_WARN_END_IN_METHOD]                     = "END in method; use at_exit",
+static const pm_diagnostic_data_t diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
+    // Errors
+    [PM_ERR_ALIAS_ARGUMENT]                     = { "invalid argument being passed to `alias`; expected a bare word, symbol, constant, or global variable", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_AMPAMPEQ_MULTI_ASSIGN]              = { "unexpected `&&=` in a multiple assignment", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_AFTER_BLOCK]               = { "unexpected argument after a block argument", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_AFTER_FORWARDING_ELLIPSES] = { "unexpected argument after `...`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_BARE_HASH]                 = { "unexpected bare hash argument", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_BLOCK_FORWARDING]          = { "both a block argument and a forwarding argument; only one block is allowed", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_BLOCK_MULTI]               = { "multiple block arguments; only one block is allowed", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_FORMAL_CLASS]              = { "invalid formal argument; formal argument cannot be a class variable", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_FORMAL_CONSTANT]           = { "invalid formal argument; formal argument cannot be a constant", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_FORMAL_GLOBAL]             = { "invalid formal argument; formal argument cannot be a global variable", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_FORMAL_IVAR]               = { "invalid formal argument; formal argument cannot be an instance variable", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_FORWARDING_UNBOUND]        = { "unexpected `...` in an non-parenthesized call", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_IN]                        = { "unexpected `in` keyword in arguments", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_NO_FORWARDING_AMP]         = { "unexpected `&` when the parent method is not forwarding", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_NO_FORWARDING_ELLIPSES]    = { "unexpected `...` when the parent method is not forwarding", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_NO_FORWARDING_STAR]        = { "unexpected `*` when the parent method is not forwarding", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_SPLAT_AFTER_ASSOC_SPLAT]   = { "unexpected `*` splat argument after a `**` keyword splat argument", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_SPLAT_AFTER_SPLAT]         = { "unexpected `*` splat argument after a `*` splat argument", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_TERM_PAREN]                = { "expected a `)` to close the arguments", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARGUMENT_UNEXPECTED_BLOCK]          = { "unexpected `{` after a method call without parenthesis", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARRAY_ELEMENT]                      = { "expected an element for the array", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARRAY_EXPRESSION]                   = { "expected an expression for the array element", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARRAY_EXPRESSION_AFTER_STAR]        = { "expected an expression after `*` in the array", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARRAY_SEPARATOR]                    = { "expected a `,` separator for the array elements", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ARRAY_TERM]                         = { "expected a `]` to close the array", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_BEGIN_LONELY_ELSE]                  = { "unexpected `else` in `begin` block; a `rescue` clause must precede `else`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_BEGIN_TERM]                         = { "expected an `end` to close the `begin` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_BEGIN_UPCASE_BRACE]                 = { "expected a `{` after `BEGIN`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_BEGIN_UPCASE_TERM]                  = { "expected a `}` to close the `BEGIN` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_BEGIN_UPCASE_TOPLEVEL]              = { "BEGIN is permitted only at toplevel", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_BLOCK_PARAM_LOCAL_VARIABLE]         = { "expected a local variable name in the block parameters", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_BLOCK_PARAM_PIPE_TERM]              = { "expected the block parameters to end with `|`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_BLOCK_TERM_BRACE]                   = { "expected a block beginning with `{` to end with `}`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_BLOCK_TERM_END]                     = { "expected a block beginning with `do` to end with `end`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CANNOT_PARSE_EXPRESSION]            = { "cannot parse the expression", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CANNOT_PARSE_STRING_PART]           = { "cannot parse the string part", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CASE_EXPRESSION_AFTER_CASE]         = { "expected an expression after `case`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CASE_EXPRESSION_AFTER_WHEN]         = { "expected an expression after `when`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CASE_MATCH_MISSING_PREDICATE]       = { "expected a predicate for a case matching statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CASE_MISSING_CONDITIONS]            = { "expected a `when` or `in` clause after `case`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CASE_TERM]                          = { "expected an `end` to close the `case` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CLASS_IN_METHOD]                    = { "unexpected class definition in a method definition", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CLASS_NAME]                         = { "expected a constant name after `class`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CLASS_SUPERCLASS]                   = { "expected a superclass after `<`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CLASS_TERM]                         = { "expected an `end` to close the `class` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CLASS_UNEXPECTED_END]               = { "unexpected `end`, expecting ';' or '\\n'", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CONDITIONAL_ELSIF_PREDICATE]        = { "expected a predicate expression for the `elsif` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CONDITIONAL_IF_PREDICATE]           = { "expected a predicate expression for the `if` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CONDITIONAL_PREDICATE_TERM]         = { "expected `then` or `;` or '\\n'", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CONDITIONAL_TERM]                   = { "expected an `end` to close the conditional clause", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CONDITIONAL_TERM_ELSE]              = { "expected an `end` to close the `else` clause", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CONDITIONAL_UNLESS_PREDICATE]       = { "expected a predicate expression for the `unless` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CONDITIONAL_UNTIL_PREDICATE]        = { "expected a predicate expression for the `until` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CONDITIONAL_WHILE_PREDICATE]        = { "expected a predicate expression for the `while` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_CONSTANT_PATH_COLON_COLON_CONSTANT] = { "expected a constant after the `::` operator", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_DEF_ENDLESS]                        = { "could not parse the endless method body", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_DEF_ENDLESS_SETTER]                 = { "invalid method name; a setter method cannot be defined in an endless method definition", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_DEF_NAME]                           = { "expected a method name", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_DEF_NAME_AFTER_RECEIVER]            = { "expected a method name after the receiver", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_DEF_PARAMS_TERM]                    = { "expected a delimiter to close the parameters", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_DEF_PARAMS_TERM_PAREN]              = { "expected a `)` to close the parameters", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_DEF_RECEIVER]                       = { "expected a receiver for the method definition", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_DEF_RECEIVER_TERM]                  = { "expected a `.` or `::` after the receiver in a method definition", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_DEF_TERM]                           = { "expected an `end` to close the `def` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_DEFINED_EXPRESSION]                 = { "expected an expression after `defined?`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EMBDOC_TERM]                        = { "could not find a terminator for the embedded document", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EMBEXPR_END]                        = { "expected a `}` to close the embedded expression", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EMBVAR_INVALID]                     = { "invalid embedded variable", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_END_UPCASE_BRACE]                   = { "expected a `{` after `END`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_END_UPCASE_TERM]                    = { "expected a `}` to close the `END` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ESCAPE_INVALID_CONTROL]             = { "invalid control escape sequence", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ESCAPE_INVALID_CONTROL_REPEAT]      = { "invalid control escape sequence; control cannot be repeated", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ESCAPE_INVALID_HEXADECIMAL]         = { "invalid hexadecimal escape sequence", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ESCAPE_INVALID_META]                = { "invalid meta escape sequence", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ESCAPE_INVALID_META_REPEAT]         = { "invalid meta escape sequence; meta cannot be repeated", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ESCAPE_INVALID_UNICODE]             = { "invalid Unicode escape sequence", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ESCAPE_INVALID_UNICODE_CM_FLAGS]    = { "invalid Unicode escape sequence; Unicode cannot be combined with control or meta flags", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ESCAPE_INVALID_UNICODE_LITERAL]     = { "invalid Unicode escape sequence; multiple codepoints are not allowed in a character literal", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ESCAPE_INVALID_UNICODE_LONG]        = { "invalid Unicode escape sequence; maximum length is 6 digits", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_ESCAPE_INVALID_UNICODE_TERM]        = { "invalid Unicode escape sequence; needs closing `}`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_ARGUMENT]                    = { "expected an argument", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_EOL_AFTER_STATEMENT]         = { "expected a newline or semicolon after the statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_AMPAMPEQ]   = { "expected an expression after `&&=`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_PIPEPIPEEQ] = { "expected an expression after `||=`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_COMMA]      = { "expected an expression after `,`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_EQUAL]      = { "expected an expression after `=`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_LESS_LESS]  = { "expected an expression after `<<`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_LPAREN]     = { "expected an expression after `(`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_OPERATOR]   = { "expected an expression after the operator", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT]      = { "expected an expression after `*` splat in an argument", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT_HASH] = { "expected an expression after `**` in a hash", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_EXPRESSION_AFTER_STAR]       = { "expected an expression after `*`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_IDENT_REQ_PARAMETER]         = { "expected an identifier for the required parameter", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_LPAREN_REQ_PARAMETER]        = { "expected a `(` to start a required parameter", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_RBRACKET]                    = { "expected a matching `]`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_RPAREN]                      = { "expected a matching `)`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_RPAREN_AFTER_MULTI]          = { "expected a `)` after multiple assignment", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_RPAREN_REQ_PARAMETER]        = { "expected a `)` to end a required parameter", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_STRING_CONTENT]              = { "expected string content after opening string delimiter", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPECT_WHEN_DELIMITER]              = { "expected a delimiter after the predicates of a `when` clause", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_EXPRESSION_BARE_HASH]               = { "unexpected bare hash in expression", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_FOR_COLLECTION]                     = { "expected a collection after the `in` in a `for` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_FOR_INDEX]                          = { "expected an index after `for`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_FOR_IN]                             = { "expected an `in` after the index in a `for` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_FOR_TERM]                           = { "expected an `end` to close the `for` loop", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_HASH_EXPRESSION_AFTER_LABEL]        = { "expected an expression after the label in a hash", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_HASH_KEY]                           = { "expected a key in the hash literal", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_HASH_ROCKET]                        = { "expected a `=>` between the hash key and value", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_HASH_TERM]                          = { "expected a `}` to close the hash literal", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_HASH_VALUE]                         = { "expected a value in the hash literal", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_HEREDOC_TERM]                       = { "could not find a terminator for the heredoc", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_INCOMPLETE_QUESTION_MARK]           = { "incomplete expression at `?`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_INCOMPLETE_VARIABLE_CLASS]          = { "incomplete class variable", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_INCOMPLETE_VARIABLE_INSTANCE]       = { "incomplete instance variable", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_INVALID_ENCODING_MAGIC_COMMENT]     = { "unknown or invalid encoding in the magic comment", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_INVALID_FLOAT_EXPONENT]             = { "invalid exponent", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_INVALID_NUMBER_BINARY]              = { "invalid binary number", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_INVALID_NUMBER_DECIMAL]             = { "invalid decimal number", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_INVALID_NUMBER_HEXADECIMAL]         = { "invalid hexadecimal number", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_INVALID_NUMBER_OCTAL]               = { "invalid octal number", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_INVALID_NUMBER_UNDERSCORE]          = { "invalid underscore placement in number", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_INVALID_PERCENT]                    = { "invalid `%` token", PM_ERROR_LEVEL_FATAL }, // TODO WHAT?
+    [PM_ERR_INVALID_TOKEN]                      = { "invalid token", PM_ERROR_LEVEL_FATAL }, // TODO WHAT?
+    [PM_ERR_INVALID_VARIABLE_GLOBAL]            = { "invalid global variable", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_IT_NOT_ALLOWED]                     = { "`it` is not allowed when an ordinary parameter is defined", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_LAMBDA_OPEN]                        = { "expected a `do` keyword or a `{` to open the lambda block", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_LAMBDA_TERM_BRACE]                  = { "expected a lambda block beginning with `{` to end with `}`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_LAMBDA_TERM_END]                    = { "expected a lambda block beginning with `do` to end with `end`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_LIST_I_LOWER_ELEMENT]               = { "expected a symbol in a `%i` list", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_LIST_I_LOWER_TERM]                  = { "expected a closing delimiter for the `%i` list", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_LIST_I_UPPER_ELEMENT]               = { "expected a symbol in a `%I` list", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_LIST_I_UPPER_TERM]                  = { "expected a closing delimiter for the `%I` list", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_LIST_W_LOWER_ELEMENT]               = { "expected a string in a `%w` list", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_LIST_W_LOWER_TERM]                  = { "expected a closing delimiter for the `%w` list", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_LIST_W_UPPER_ELEMENT]               = { "expected a string in a `%W` list", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_LIST_W_UPPER_TERM]                  = { "expected a closing delimiter for the `%W` list", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_MALLOC_FAILED]                      = { "failed to allocate memory", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_MIXED_ENCODING]                     = { "UTF-8 mixed within %s source", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_MODULE_IN_METHOD]                   = { "unexpected module definition in a method definition", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_MODULE_NAME]                        = { "expected a constant name after `module`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_MODULE_TERM]                        = { "expected an `end` to close the `module` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_MULTI_ASSIGN_MULTI_SPLATS]          = { "multiple splats in multiple assignment", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_NOT_EXPRESSION]                     = { "expected an expression after `not`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_NO_LOCAL_VARIABLE]                  = { "%.*s: no such local variable", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_NUMBER_LITERAL_UNDERSCORE]          = { "number literal ending with a `_`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_NUMBERED_PARAMETER_NOT_ALLOWED]     = { "numbered parameters are not allowed when an ordinary parameter is defined", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_NUMBERED_PARAMETER_OUTER_SCOPE]     = { "numbered parameter is already used in outer scope", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_OPERATOR_MULTI_ASSIGN]              = { "unexpected operator for a multiple assignment", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_OPERATOR_WRITE_ARGUMENTS]           = { "unexpected operator after a call with arguments", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_OPERATOR_WRITE_BLOCK]               = { "unexpected operator after a call with a block", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_ASSOC_SPLAT_MULTI]        = { "unexpected multiple `**` splat parameters", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_BLOCK_MULTI]              = { "multiple block parameters; only one block is allowed", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_CIRCULAR]                 = { "parameter default value references itself", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_METHOD_NAME]              = { "unexpected name for a parameter", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_NAME_REPEAT]              = { "repeated parameter name", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_NO_DEFAULT]               = { "expected a default value for the parameter", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_NO_DEFAULT_KW]            = { "expected a default value for the keyword parameter", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_NUMBERED_RESERVED]        = { "%.2s is reserved for numbered parameters", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_ORDER]                    = { "unexpected parameter order", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_SPLAT_MULTI]              = { "unexpected multiple `*` splat parameters", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_STAR]                     = { "unexpected parameter `*`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_UNEXPECTED_FWD]           = { "unexpected `...` in parameters", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PARAMETER_WILD_LOOSE_COMMA]         = { "unexpected `,` in parameters", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET]   = { "expected a pattern expression after the `[` operator", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_COMMA]     = { "expected a pattern expression after `,`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_HROCKET]   = { "expected a pattern expression after `=>`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_IN]        = { "expected a pattern expression after the `in` keyword", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_KEY]       = { "expected a pattern expression after the key", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_PAREN]     = { "expected a pattern expression after the `(` operator", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_PIN]       = { "expected a pattern expression after the `^` pin operator", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_PIPE]      = { "expected a pattern expression after the `|` operator", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_RANGE]     = { "expected a pattern expression after the range operator", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_EXPRESSION_AFTER_REST]      = { "unexpected pattern expression after the `**` expression", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_HASH_KEY]                   = { "expected a key in the hash pattern", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_HASH_KEY_LABEL]             = { "expected a label as the key in the hash pattern", PM_ERROR_LEVEL_FATAL }, // TODO // THIS // AND // ABOVE // IS WEIRD
+    [PM_ERR_PATTERN_IDENT_AFTER_HROCKET]        = { "expected an identifier after the `=>` operator", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_LABEL_AFTER_COMMA]          = { "expected a label after the `,` in the hash pattern", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_REST]                       = { "unexpected rest pattern", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_TERM_BRACE]                 = { "expected a `}` to close the pattern expression", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_TERM_BRACKET]               = { "expected a `]` to close the pattern expression", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PATTERN_TERM_PAREN]                 = { "expected a `)` to close the pattern expression", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_PIPEPIPEEQ_MULTI_ASSIGN]            = { "unexpected `||=` in a multiple assignment", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_REGEXP_TERM]                        = { "expected a closing delimiter for the regular expression", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_RESCUE_EXPRESSION]                  = { "expected a rescued expression", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_RESCUE_MODIFIER_VALUE]              = { "expected a value after the `rescue` modifier", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_RESCUE_TERM]                        = { "expected a closing delimiter for the `rescue` clause", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_RESCUE_VARIABLE]                    = { "expected an exception variable after `=>` in a rescue statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_RETURN_INVALID]                     = { "invalid `return` in a class or module body", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_STATEMENT_ALIAS]                    = { "unexpected an `alias` at a non-statement position", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_STATEMENT_POSTEXE_END]              = { "unexpected an `END` at a non-statement position", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_STATEMENT_PREEXE_BEGIN]             = { "unexpected a `BEGIN` at a non-statement position", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_STATEMENT_UNDEF]                    = { "unexpected an `undef` at a non-statement position", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_STRING_CONCATENATION]               = { "expected a string for concatenation", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_STRING_INTERPOLATED_TERM]           = { "expected a closing delimiter for the interpolated string", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_STRING_LITERAL_TERM]                = { "expected a closing delimiter for the string literal", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_SYMBOL_INVALID]                     = { "invalid symbol", PM_ERROR_LEVEL_FATAL }, // TODO expected symbol? prism.c ~9719
+    [PM_ERR_SYMBOL_TERM_DYNAMIC]                = { "expected a closing delimiter for the dynamic symbol", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_SYMBOL_TERM_INTERPOLATED]           = { "expected a closing delimiter for the interpolated symbol", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_TERNARY_COLON]                      = { "expected a `:` after the true expression of a ternary operator", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_TERNARY_EXPRESSION_FALSE]           = { "expected an expression after `:` in the ternary operator", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_TERNARY_EXPRESSION_TRUE]            = { "expected an expression after `?` in the ternary operator", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_UNDEF_ARGUMENT]                     = { "invalid argument being passed to `undef`; expected a bare word, constant, or symbol argument", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_UNARY_RECEIVER_BANG]                = { "expected a receiver for unary `!`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_UNARY_RECEIVER_MINUS]               = { "expected a receiver for unary `-`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_UNARY_RECEIVER_PLUS]                = { "expected a receiver for unary `+`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_UNARY_RECEIVER_TILDE]               = { "expected a receiver for unary `~`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_UNTIL_TERM]                         = { "expected an `end` to close the `until` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_VOID_EXPRESSION]                    = { "unexpected void value expression", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_WHILE_TERM]                         = { "expected an `end` to close the `while` statement", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_WRITE_TARGET_IN_METHOD]             = { "dynamic constant assignment", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_WRITE_TARGET_READONLY]              = { "immutable variable as a write target", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_WRITE_TARGET_UNEXPECTED]            = { "unexpected write target", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_XSTRING_TERM]                       = { "expected a closing delimiter for the `%x` or backtick string", PM_ERROR_LEVEL_FATAL },
+
+    // Warnings
+    [PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_MINUS]    = { "ambiguous first argument; put parentheses or a space even after `-` operator", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_PLUS]     = { "ambiguous first argument; put parentheses or a space even after `+` operator", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_AMBIGUOUS_PREFIX_STAR]             = { "ambiguous `*` has been interpreted as an argument prefix", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_AMBIGUOUS_SLASH]                   = { "ambiguous `/`; wrap regexp in parentheses or add a space after `/` operator", PM_WARNING_LEVEL_VERBOSE },
+    [PM_WARN_END_IN_METHOD]                     = { "END in method; use at_exit", PM_WARNING_LEVEL_DEFAULT },
 };
 
-static const char*
+static inline const char *
 pm_diagnostic_message(pm_diagnostic_id_t diag_id) {
     assert(diag_id < PM_DIAGNOSTIC_ID_LEN);
 
-    const char *message = diagnostic_messages[diag_id];
+    const char *message = diagnostic_messages[diag_id].message;
     assert(message);
 
     return message;
 }
 
+static inline uint8_t
+pm_diagnostic_level(pm_diagnostic_id_t diag_id) {
+    assert(diag_id < PM_DIAGNOSTIC_ID_LEN);
+
+    return (uint8_t) diagnostic_messages[diag_id].level;
+}
+
 /**
  * Append an error to the given list of diagnostic.
  */
@@ -292,7 +322,8 @@ pm_diagnostic_list_append(pm_list_t *list, const uint8_t *start, const uint8_t *
     *diagnostic = (pm_diagnostic_t) {
         .location = { start, end },
         .message = pm_diagnostic_message(diag_id),
-        .owned = false
+        .owned = false,
+        .level = pm_diagnostic_level(diag_id)
     };
 
     pm_list_append(list, (pm_list_node_t *) diagnostic);
@@ -335,7 +366,8 @@ pm_diagnostic_list_append_format(pm_list_t *list, const uint8_t *start, const ui
     *diagnostic = (pm_diagnostic_t) {
         .location = { start, end },
         .message = message,
-        .owned = true
+        .owned = true,
+        .level = pm_diagnostic_level(diag_id)
     };
 
     pm_list_append(list, (pm_list_node_t *) diagnostic);
diff --git a/src/main/c/yarp/src/node.c b/src/main/c/yarp/src/node.c
index f05d66ce498d..0cb7f1f78a19 100644
--- a/src/main/c/yarp/src/node.c
+++ b/src/main/c/yarp/src/node.c
@@ -117,9 +117,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
         case PM_ASSOC_NODE: {
             pm_assoc_node_t *cast = (pm_assoc_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->key);
-            if (cast->value != NULL) {
-                pm_node_destroy(parser, (pm_node_t *)cast->value);
-            }
+            pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
 #line 58 "node.c.erb"
@@ -1223,9 +1221,7 @@ pm_node_memsize_node(pm_node_t *node, pm_memsize_t *memsize) {
             pm_assoc_node_t *cast = (pm_assoc_node_t *) node;
             memsize->memsize += sizeof(*cast);
             pm_node_memsize_node((pm_node_t *)cast->key, memsize);
-            if (cast->value != NULL) {
-                pm_node_memsize_node((pm_node_t *)cast->value, memsize);
-            }
+            pm_node_memsize_node((pm_node_t *)cast->value, memsize);
             break;
         }
 #line 103 "node.c.erb"
diff --git a/src/main/c/yarp/src/prettyprint.c b/src/main/c/yarp/src/prettyprint.c
index 35a7e436f80b..ebd78f42a559 100644
--- a/src/main/c/yarp/src/prettyprint.c
+++ b/src/main/c/yarp/src/prettyprint.c
@@ -46,7 +46,7 @@ static inline void
 prettyprint_location(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm_location_t *location) {
     pm_line_column_t start = pm_newline_list_line_column(&parser->newline_list, location->start);
     pm_line_column_t end = pm_newline_list_line_column(&parser->newline_list, location->end);
-    pm_buffer_append_format(output_buffer, "(%lu,%lu)-(%lu,%lu)", (unsigned long) (start.line + 1), (unsigned long) start.column, (unsigned long) (end.line + 1), (unsigned long) end.column);
+    pm_buffer_append_format(output_buffer, "(%lu,%lu)-(%lu,%lu)", (unsigned long) start.line, (unsigned long) start.column, (unsigned long) end.line, (unsigned long) end.column);
 }
 
 static inline void
@@ -518,17 +518,13 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
                 pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 value:", 16);
-                if (cast->value == NULL) {
-                    pm_buffer_append_string(output_buffer, " \xe2\x88\x85\n", 5);
-                } else {
-                    pm_buffer_append_byte(output_buffer, '\n');
+                pm_buffer_append_byte(output_buffer, '\n');
 
-                    size_t prefix_length = prefix_buffer->length;
-                    pm_buffer_append_string(prefix_buffer, "\xe2\x94\x82   ", 6);
-                    pm_buffer_concat(output_buffer, prefix_buffer);
-                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast->value, prefix_buffer);
-                    prefix_buffer->length = prefix_length;
-                }
+                size_t prefix_length = prefix_buffer->length;
+                pm_buffer_append_string(prefix_buffer, "\xe2\x94\x82   ", 6);
+                pm_buffer_concat(output_buffer, prefix_buffer);
+                prettyprint_node(output_buffer, parser, (pm_node_t *) cast->value, prefix_buffer);
+                prefix_buffer->length = prefix_length;
             }
 
             // operator_loc
diff --git a/src/main/c/yarp/src/prism.c b/src/main/c/yarp/src/prism.c
index 2f92cb0da9e0..69f896cbb6b7 100644
--- a/src/main/c/yarp/src/prism.c
+++ b/src/main/c/yarp/src/prism.c
@@ -423,6 +423,11 @@ lex_state_beg_p(pm_parser_t *parser) {
     return lex_state_p(parser, PM_LEX_STATE_BEG_ANY) || ((parser->lex_state & (PM_LEX_STATE_ARG | PM_LEX_STATE_LABELED)) == (PM_LEX_STATE_ARG | PM_LEX_STATE_LABELED));
 }
 
+static inline bool
+lex_state_arg_labeled_p(pm_parser_t *parser) {
+    return (parser->lex_state & (PM_LEX_STATE_ARG | PM_LEX_STATE_LABELED)) == (PM_LEX_STATE_ARG | PM_LEX_STATE_LABELED);
+}
+
 static inline bool
 lex_state_arg_p(pm_parser_t *parser) {
     return lex_state_p(parser, PM_LEX_STATE_ARG_ANY);
@@ -1344,7 +1349,7 @@ pm_assoc_node_create(pm_parser_t *parser, pm_node_t *key, const pm_token_t *oper
     pm_assoc_node_t *node = PM_ALLOC_NODE(parser, pm_assoc_node_t);
     const uint8_t *end;
 
-    if (value != NULL) {
+    if (value != NULL && value->location.end > key->location.end) {
         end = value->location.end;
     } else if (operator->type != PM_TOKEN_NOT_PROVIDED) {
         end = operator->end;
@@ -1352,6 +1357,13 @@ pm_assoc_node_create(pm_parser_t *parser, pm_node_t *key, const pm_token_t *oper
         end = key->location.end;
     }
 
+    // Hash string keys will be frozen, so we can mark them as frozen here so
+    // that the compiler picks them up and also when we check for static literal
+    // on the keys it gets factored in.
+    if (PM_NODE_TYPE_P(key, PM_STRING_NODE)) {
+        key->flags |= PM_STRING_FLAGS_FROZEN | PM_NODE_FLAG_STATIC_LITERAL;
+    }
+
     // If the key and value of this assoc node are both static literals, then
     // we can mark this node as a static literal.
     pm_node_flags_t flags = 0;
@@ -1359,11 +1371,6 @@ pm_assoc_node_create(pm_parser_t *parser, pm_node_t *key, const pm_token_t *oper
         flags = key->flags & value->flags & PM_NODE_FLAG_STATIC_LITERAL;
     }
 
-    // Hash string keys should be frozen
-    if (PM_NODE_TYPE_P(key, PM_STRING_NODE)) {
-        key->flags |= PM_STRING_FLAGS_FROZEN;
-    }
-
     *node = (pm_assoc_node_t) {
         {
             .type = PM_ASSOC_NODE,
@@ -3997,9 +4004,8 @@ pm_keyword_hash_node_create(pm_parser_t *parser) {
  */
 static void
 pm_keyword_hash_node_elements_append(pm_keyword_hash_node_t *hash, pm_node_t *element) {
-    // If the element being added is not an AssocNode or does not have a symbol key, then
-    // we want to turn the STATIC_KEYS flag off.
-    // TODO: Rename the flag to SYMBOL_KEYS instead.
+    // If the element being added is not an AssocNode or does not have a symbol
+    // key, then we want to turn the SYMBOL_KEYS flag off.
     if (!PM_NODE_TYPE_P(element, PM_ASSOC_NODE) || !PM_NODE_TYPE_P(((pm_assoc_node_t *) element)->key, PM_SYMBOL_NODE)) {
         pm_node_flag_unset((pm_node_t *)hash, PM_KEYWORD_HASH_NODE_FLAGS_SYMBOL_KEYS);
     }
@@ -5465,18 +5471,59 @@ pm_super_node_create(pm_parser_t *parser, const pm_token_t *keyword, pm_argument
     return node;
 }
 
+/**
+ * Read through the contents of a string and check if it consists solely of US ASCII code points.
+ */
+static bool
+pm_ascii_only_p(const pm_string_t *contents) {
+    const size_t length = pm_string_length(contents);
+    const uint8_t *source = pm_string_source(contents);
+
+    for (size_t index = 0; index < length; index++) {
+        if (source[index] & 0x80) return false;
+    }
+
+    return true;
+}
+
+/**
+ * Ruby "downgrades" the encoding of Symbols to US-ASCII if the associated
+ * encoding is ASCII-compatible and the Symbol consists only of US-ASCII code
+ * points. Otherwise, the encoding may be explicitly set with an escape
+ * sequence.
+ */
+static inline pm_node_flags_t
+parse_symbol_encoding(const pm_parser_t *parser, const pm_string_t *contents) {
+    if (parser->explicit_encoding != NULL) {
+        // A Symbol may optionally have its encoding explicitly set. This will
+        // happen if an escape sequence results in a non-ASCII code point.
+        if (parser->explicit_encoding == PM_ENCODING_UTF_8_ENTRY) {
+            return PM_SYMBOL_FLAGS_FORCED_UTF8_ENCODING;
+        } else if (parser->encoding == PM_ENCODING_US_ASCII_ENTRY) {
+            return PM_SYMBOL_FLAGS_FORCED_BINARY_ENCODING;
+        }
+    } else if (pm_ascii_only_p(contents)) {
+        // Ruby stipulates that all source files must use an ASCII-compatible
+        // encoding. Thus, all symbols appearing in source are eligible for
+        // "downgrading" to US-ASCII.
+        return PM_SYMBOL_FLAGS_FORCED_US_ASCII_ENCODING;
+    }
+
+    return 0;
+}
+
 /**
  * Allocate and initialize a new SymbolNode node with the given unescaped
  * string.
  */
 static pm_symbol_node_t *
-pm_symbol_node_create_unescaped(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *value, const pm_token_t *closing, const pm_string_t *unescaped) {
+pm_symbol_node_create_unescaped(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *value, const pm_token_t *closing, const pm_string_t *unescaped, pm_node_flags_t flags) {
     pm_symbol_node_t *node = PM_ALLOC_NODE(parser, pm_symbol_node_t);
 
     *node = (pm_symbol_node_t) {
         {
             .type = PM_SYMBOL_NODE,
-            .flags = PM_NODE_FLAG_STATIC_LITERAL,
+            .flags = PM_NODE_FLAG_STATIC_LITERAL | flags,
             .location = {
                 .start = (opening->type == PM_TOKEN_NOT_PROVIDED ? value->start : opening->start),
                 .end = (closing->type == PM_TOKEN_NOT_PROVIDED ? value->end : closing->end)
@@ -5496,7 +5543,7 @@ pm_symbol_node_create_unescaped(pm_parser_t *parser, const pm_token_t *opening,
  */
 static inline pm_symbol_node_t *
 pm_symbol_node_create(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *value, const pm_token_t *closing) {
-    return pm_symbol_node_create_unescaped(parser, opening, value, closing, &PM_STRING_EMPTY);
+    return pm_symbol_node_create_unescaped(parser, opening, value, closing, &PM_STRING_EMPTY, 0);
 }
 
 /**
@@ -5504,7 +5551,7 @@ pm_symbol_node_create(pm_parser_t *parser, const pm_token_t *opening, const pm_t
  */
 static pm_symbol_node_t *
 pm_symbol_node_create_current_string(pm_parser_t *parser, const pm_token_t *opening, const pm_token_t *value, const pm_token_t *closing) {
-    pm_symbol_node_t *node = pm_symbol_node_create_unescaped(parser, opening, value, closing, &parser->current_string);
+    pm_symbol_node_t *node = pm_symbol_node_create_unescaped(parser, opening, value, closing, &parser->current_string, parse_symbol_encoding(parser, &parser->current_string));
     parser->current_string = PM_STRING_EMPTY;
     return node;
 }
@@ -5526,6 +5573,8 @@ pm_symbol_node_label_create(pm_parser_t *parser, const pm_token_t *token) {
 
             assert((label.end - label.start) >= 0);
             pm_string_shared_init(&node->unescaped, label.start, label.end);
+            pm_node_flag_set((pm_node_t *) node, parse_symbol_encoding(parser, &node->unescaped));
+
             break;
         }
         case PM_TOKEN_MISSING: {
@@ -5588,6 +5637,8 @@ pm_string_node_to_symbol_node(pm_parser_t *parser, pm_string_node_t *node, const
         .unescaped = node->unescaped
     };
 
+    pm_node_flag_set((pm_node_t *)new_node, parse_symbol_encoding(parser, &node->unescaped));
+
     // We are explicitly _not_ using pm_node_destroy here because we don't want
     // to trash the unescaped string. We could instead copy the string if we
     // know that it is owned, but we're taking the fast path for now.
@@ -8109,7 +8160,6 @@ pm_token_buffer_push(pm_token_buffer_t *token_buffer, uint8_t byte) {
 /**
  * When we're about to return from lexing the current token and we know for sure
  * that we have found an escape sequence, this function is called to copy the
- *
  * contents of the token buffer into the current string on the parser so that it
  * can be attached to the correct node.
  */
@@ -8124,7 +8174,6 @@ pm_token_buffer_copy(pm_parser_t *parser, pm_token_buffer_t *token_buffer) {
  * string. If we haven't pushed anything into the buffer, this means that we
  * never found an escape sequence, so we can directly reference the bounds of
  * the current string. Either way, at the return of this function it is expected
- *
  * that parser->current_string is established in such a way that it can be
  * attached to a node.
  */
@@ -8143,7 +8192,6 @@ pm_token_buffer_flush(pm_parser_t *parser, pm_token_buffer_t *token_buffer) {
  * point into the buffer because we're about to provide a string that has
  * different content than a direct slice of the source.
  *
- *
  * It is expected that the parser's current token end will be pointing at one
  * byte past the backslash that starts the escape sequence.
  */
@@ -11019,7 +11067,7 @@ parse_write(pm_parser_t *parser, pm_node_t *target, pm_token_t *operator, pm_nod
                     return target;
                 }
 
-                if (*call->message_loc.start == '_' || parser->encoding->alnum_char(call->message_loc.start, call->message_loc.end - call->message_loc.start)) {
+                if (char_is_identifier_start(parser, call->message_loc.start)) {
                     // When we get here, we have a method call, because it was
                     // previously marked as a method call but now we have an =. This
                     // looks like:
@@ -11137,6 +11185,7 @@ parse_targets(pm_parser_t *parser, pm_node_t *first_target, pm_binding_power_t b
 static pm_node_t *
 parse_targets_validate(pm_parser_t *parser, pm_node_t *first_target, pm_binding_power_t binding_power) {
     pm_node_t *result = parse_targets(parser, first_target, binding_power);
+    accept1(parser, PM_TOKEN_NEWLINE);
 
     // Ensure that we have either an = or a ) after the targets.
     if (!match2(parser, PM_TOKEN_EQUAL, PM_TOKEN_PARENTHESIS_RIGHT)) {
@@ -12589,8 +12638,14 @@ static inline pm_node_flags_t
 parse_unescaped_encoding(const pm_parser_t *parser) {
     if (parser->explicit_encoding != NULL) {
         if (parser->explicit_encoding == PM_ENCODING_UTF_8_ENTRY) {
+            // If the there's an explicit encoding and it's using a UTF-8 escape
+            // sequence, then mark the string as UTF-8.
             return PM_STRING_FLAGS_FORCED_UTF8_ENCODING;
         } else if (parser->encoding == PM_ENCODING_US_ASCII_ENTRY) {
+            // If there's a non-UTF-8 escape sequence being used, then the
+            // string uses the source encoding, unless the source is marked as
+            // US-ASCII. In that case the string is forced as ASCII-8BIT in
+            // order to keep the string valid.
             return PM_STRING_FLAGS_FORCED_BINARY_ENCODING;
         }
     }
@@ -12719,25 +12774,31 @@ parse_string_part(pm_parser_t *parser) {
  * automatically drop trailing `@` characters. This happens at the parser level,
  * such that `~@` is parsed as `~` and `!@` is parsed as `!`. We do that here.
  */
+static const uint8_t *
+parse_operator_symbol_name(const pm_token_t *name) {
+    switch (name->type) {
+        case PM_TOKEN_TILDE:
+        case PM_TOKEN_BANG:
+            if (name->end[-1] == '@') return name->end - 1;
+        /* fallthrough */
+        default:
+            return name->end;
+    }
+}
+
 static pm_node_t *
 parse_operator_symbol(pm_parser_t *parser, const pm_token_t *opening, pm_lex_state_t next_state) {
     pm_token_t closing = not_provided(parser);
     pm_symbol_node_t *symbol = pm_symbol_node_create(parser, opening, &parser->current, &closing);
 
-    const uint8_t *end = parser->current.end;
-    switch (parser->current.type) {
-        case PM_TOKEN_TILDE:
-        case PM_TOKEN_BANG:
-            if (parser->current.end[-1] == '@') end--;
-            break;
-        default:
-            break;
-    }
+    const uint8_t *end = parse_operator_symbol_name(&parser->current);
 
     if (next_state != PM_LEX_STATE_NONE) lex_state_set(parser, next_state);
     parser_lex(parser);
 
     pm_string_shared_init(&symbol->unescaped, parser->previous.start, end);
+    pm_node_flag_set((pm_node_t *) symbol, PM_SYMBOL_FLAGS_FORCED_US_ASCII_ENCODING);
+
     return (pm_node_t *) symbol;
 }
 
@@ -12776,6 +12837,8 @@ parse_symbol(pm_parser_t *parser, pm_lex_mode_t *lex_mode, pm_lex_state_t next_s
         pm_symbol_node_t *symbol = pm_symbol_node_create(parser, &opening, &parser->previous, &closing);
 
         pm_string_shared_init(&symbol->unescaped, parser->previous.start, parser->previous.end);
+        pm_node_flag_set((pm_node_t *) symbol, parse_symbol_encoding(parser, &symbol->unescaped));
+
         return (pm_node_t *) symbol;
     }
 
@@ -12872,7 +12935,8 @@ parse_symbol(pm_parser_t *parser, pm_lex_mode_t *lex_mode, pm_lex_state_t next_s
     } else {
         expect1(parser, PM_TOKEN_STRING_END, PM_ERR_SYMBOL_TERM_DYNAMIC);
     }
-    return (pm_node_t *) pm_symbol_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped);
+
+    return (pm_node_t *) pm_symbol_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped, parse_symbol_encoding(parser, &unescaped));
 }
 
 /**
@@ -12897,6 +12961,8 @@ parse_undef_argument(pm_parser_t *parser) {
             pm_symbol_node_t *symbol = pm_symbol_node_create(parser, &opening, &parser->previous, &closing);
 
             pm_string_shared_init(&symbol->unescaped, parser->previous.start, parser->previous.end);
+            pm_node_flag_set((pm_node_t *) symbol, parse_symbol_encoding(parser, &symbol->unescaped));
+
             return (pm_node_t *) symbol;
         }
         case PM_TOKEN_SYMBOL_BEGIN: {
@@ -12936,6 +13002,8 @@ parse_alias_argument(pm_parser_t *parser, bool first) {
             pm_symbol_node_t *symbol = pm_symbol_node_create(parser, &opening, &parser->previous, &closing);
 
             pm_string_shared_init(&symbol->unescaped, parser->previous.start, parser->previous.end);
+            pm_node_flag_set((pm_node_t *) symbol, parse_symbol_encoding(parser, &symbol->unescaped));
+
             return (pm_node_t *) symbol;
         }
         case PM_TOKEN_SYMBOL_BEGIN: {
@@ -13326,43 +13394,77 @@ parse_pattern_keyword_rest(pm_parser_t *parser) {
     return (pm_node_t *) pm_assoc_splat_node_create(parser, value, &operator);
 }
 
+/**
+ * Create an implicit node for the value of a hash pattern that has omitted the
+ * value. This will use an implicit local variable target.
+ */
+static pm_node_t *
+parse_pattern_hash_implicit_value(pm_parser_t *parser, pm_symbol_node_t *key) {
+    const pm_location_t *value_loc = &((pm_symbol_node_t *) key)->value_loc;
+    pm_constant_id_t name = pm_parser_constant_id_location(parser, value_loc->start, value_loc->end);
+
+    int current_depth = pm_parser_local_depth_constant_id(parser, name);
+    uint32_t depth;
+
+    if (current_depth == -1) {
+        pm_parser_local_add_location(parser, value_loc->start, value_loc->end);
+        depth = 0;
+    } else {
+        depth = (uint32_t) current_depth;
+    }
+
+    pm_local_variable_target_node_t *target = pm_local_variable_target_node_create_values(parser, value_loc, name, depth);
+    return (pm_node_t *) pm_implicit_node_create(parser, (pm_node_t *) target);
+}
+
 /**
  * Parse a hash pattern.
  */
 static pm_hash_pattern_node_t *
-parse_pattern_hash(pm_parser_t *parser, pm_node_t *first_assoc) {
+parse_pattern_hash(pm_parser_t *parser, pm_node_t *first_node) {
     pm_node_list_t assocs = { 0 };
     pm_node_t *rest = NULL;
 
-    switch (PM_NODE_TYPE(first_assoc)) {
-        case PM_ASSOC_NODE: {
-            if (!match7(parser, PM_TOKEN_COMMA, PM_TOKEN_KEYWORD_THEN, PM_TOKEN_BRACE_RIGHT, PM_TOKEN_BRACKET_RIGHT, PM_TOKEN_PARENTHESIS_RIGHT, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON)) {
-                // Here we have a value for the first assoc in the list, so we will
-                // parse it now and update the first assoc.
-                pm_node_t *value = parse_pattern(parser, false, PM_ERR_PATTERN_EXPRESSION_AFTER_KEY);
+    switch (PM_NODE_TYPE(first_node)) {
+        case PM_ASSOC_SPLAT_NODE:
+        case PM_NO_KEYWORDS_PARAMETER_NODE:
+            rest = first_node;
+            break;
+        case PM_SYMBOL_NODE: {
+            if (pm_symbol_node_label_p(first_node)) {
+                pm_node_t *value;
+
+                if (!match7(parser, PM_TOKEN_COMMA, PM_TOKEN_KEYWORD_THEN, PM_TOKEN_BRACE_RIGHT, PM_TOKEN_BRACKET_RIGHT, PM_TOKEN_PARENTHESIS_RIGHT, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON)) {
+                    // Here we have a value for the first assoc in the list, so
+                    // we will parse it now.
+                    value = parse_pattern(parser, false, PM_ERR_PATTERN_EXPRESSION_AFTER_KEY);
+                } else {
+                    // Otherwise, we will create an implicit local variable
+                    // target for the value.
+                    value = parse_pattern_hash_implicit_value(parser, (pm_symbol_node_t *) first_node);
+                }
 
-                pm_assoc_node_t *assoc = (pm_assoc_node_t *) first_assoc;
-                assoc->base.location.end = value->location.end;
-                assoc->value = value;
-            } else {
-                pm_node_t *key = ((pm_assoc_node_t *) first_assoc)->key;
+                pm_token_t operator = not_provided(parser);
+                pm_node_t *assoc = (pm_node_t *) pm_assoc_node_create(parser, first_node, &operator, value);
 
-                if (PM_NODE_TYPE_P(key, PM_SYMBOL_NODE)) {
-                    const pm_location_t *value_loc = &((pm_symbol_node_t *) key)->value_loc;
-                    pm_parser_local_add_location(parser, value_loc->start, value_loc->end);
-                }
+                pm_node_list_append(&assocs, assoc);
+                break;
             }
+        }
+        /* fallthrough */
+        default: {
+            // If we get anything else, then this is an error. For this we'll
+            // create a missing node for the value and create an assoc node for
+            // the first node in the list.
+            pm_parser_err_node(parser, first_node, PM_ERR_PATTERN_HASH_KEY_LABEL);
 
-            pm_node_list_append(&assocs, first_assoc);
+            pm_token_t operator = not_provided(parser);
+            pm_node_t *value = (pm_node_t *) pm_missing_node_create(parser, first_node->location.start, first_node->location.end);
+            pm_node_t *assoc = (pm_node_t *) pm_assoc_node_create(parser, first_node, &operator, value);
+
+            pm_node_list_append(&assocs, assoc);
             break;
         }
-        case PM_ASSOC_SPLAT_NODE:
-        case PM_NO_KEYWORDS_PARAMETER_NODE:
-            rest = first_assoc;
-            break;
-        default:
-            assert(false);
-            break;
     }
 
     // If there are any other assocs, then we'll parse them now.
@@ -13391,6 +13493,7 @@ parse_pattern_hash(pm_parser_t *parser, pm_node_t *first_assoc) {
             } else {
                 const pm_location_t *value_loc = &((pm_symbol_node_t *) key)->value_loc;
                 pm_parser_local_add_location(parser, value_loc->start, value_loc->end);
+                value = parse_pattern_hash_implicit_value(parser, (pm_symbol_node_t *) key);
             }
 
             pm_token_t operator = not_provided(parser);
@@ -13496,45 +13599,29 @@ parse_pattern_primitive(pm_parser_t *parser, pm_diagnostic_id_t diag_id) {
                 // pattern node.
                 node = pm_hash_pattern_node_empty_create(parser, &opening, &parser->previous);
             } else {
-                pm_node_t *first_assoc;
+                pm_node_t *first_node;
 
                 switch (parser->current.type) {
-                    case PM_TOKEN_LABEL: {
+                    case PM_TOKEN_LABEL:
                         parser_lex(parser);
-
-                        pm_symbol_node_t *key = pm_symbol_node_label_create(parser, &parser->previous);
-                        pm_token_t operator = not_provided(parser);
-
-                        first_assoc = (pm_node_t *) pm_assoc_node_create(parser, (pm_node_t *) key, &operator, NULL);
+                        first_node = (pm_node_t *) pm_symbol_node_label_create(parser, &parser->previous);
                         break;
-                    }
                     case PM_TOKEN_USTAR_STAR:
-                        first_assoc = parse_pattern_keyword_rest(parser);
+                        first_node = parse_pattern_keyword_rest(parser);
                         break;
-                    case PM_TOKEN_STRING_BEGIN: {
-                        pm_node_t *key = parse_expression(parser, PM_BINDING_POWER_MAX, false, PM_ERR_PATTERN_HASH_KEY);
-                        pm_token_t operator = not_provided(parser);
-
-                        if (!pm_symbol_node_label_p(key)) {
-                            pm_parser_err_node(parser, key, PM_ERR_PATTERN_HASH_KEY_LABEL);
-                        }
-
-                        first_assoc = (pm_node_t *) pm_assoc_node_create(parser, key, &operator, NULL);
+                    case PM_TOKEN_STRING_BEGIN:
+                        first_node = parse_expression(parser, PM_BINDING_POWER_MAX, false, PM_ERR_PATTERN_HASH_KEY);
                         break;
-                    }
                     default: {
                         parser_lex(parser);
                         pm_parser_err_previous(parser, PM_ERR_PATTERN_HASH_KEY);
 
-                        pm_missing_node_t *key = pm_missing_node_create(parser, parser->previous.start, parser->previous.end);
-                        pm_token_t operator = not_provided(parser);
-
-                        first_assoc = (pm_node_t *) pm_assoc_node_create(parser, (pm_node_t *) key, &operator, NULL);
+                        first_node = (pm_node_t *) pm_missing_node_create(parser, parser->previous.start, parser->previous.end);
                         break;
                     }
                 }
 
-                node = parse_pattern_hash(parser, first_assoc);
+                node = parse_pattern_hash(parser, first_node);
 
                 accept1(parser, PM_TOKEN_NEWLINE);
                 expect1(parser, PM_TOKEN_BRACE_RIGHT, PM_ERR_PATTERN_TERM_BRACE);
@@ -13778,9 +13865,7 @@ parse_pattern(pm_parser_t *parser, bool top_pattern, pm_diagnostic_id_t diag_id)
         case PM_TOKEN_LABEL: {
             parser_lex(parser);
             pm_node_t *key = (pm_node_t *) pm_symbol_node_label_create(parser, &parser->previous);
-            pm_token_t operator = not_provided(parser);
-
-            return (pm_node_t *) parse_pattern_hash(parser, (pm_node_t *) pm_assoc_node_create(parser, key, &operator, NULL));
+            return (pm_node_t *) parse_pattern_hash(parser, key);
         }
         case PM_TOKEN_USTAR_STAR: {
             node = parse_pattern_keyword_rest(parser);
@@ -13803,8 +13888,7 @@ parse_pattern(pm_parser_t *parser, bool top_pattern, pm_diagnostic_id_t diag_id)
     // If we got a dynamic label symbol, then we need to treat it like the
     // beginning of a hash pattern.
     if (pm_symbol_node_label_p(node)) {
-        pm_token_t operator = not_provided(parser);
-        return (pm_node_t *) parse_pattern_hash(parser, (pm_node_t *) pm_assoc_node_create(parser, node, &operator, NULL));
+        return (pm_node_t *) parse_pattern_hash(parser, node);
     }
 
     if (top_pattern && match1(parser, PM_TOKEN_COMMA)) {
@@ -13903,7 +13987,7 @@ parse_strings(pm_parser_t *parser, pm_node_t *current) {
     assert(parser->current.type == PM_TOKEN_STRING_BEGIN);
 
     bool concating = false;
-    bool state_is_arg_labeled = lex_state_p(parser, PM_LEX_STATE_ARG | PM_LEX_STATE_LABELED);
+    bool state_is_arg_labeled = lex_state_arg_labeled_p(parser);
 
     while (match1(parser, PM_TOKEN_STRING_BEGIN)) {
         pm_node_t *node = NULL;
@@ -13978,7 +14062,7 @@ parse_strings(pm_parser_t *parser, pm_node_t *current) {
                 expect1(parser, PM_TOKEN_STRING_END, PM_ERR_STRING_LITERAL_TERM);
                 node = (pm_node_t *) pm_interpolated_string_node_create(parser, &opening, &parts, &parser->previous);
             } else if (accept1(parser, PM_TOKEN_LABEL_END) && !state_is_arg_labeled) {
-                node = (pm_node_t *) pm_symbol_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped);
+                node = (pm_node_t *) pm_symbol_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped, parse_symbol_encoding(parser, &unescaped));
             } else if (match1(parser, PM_TOKEN_EOF)) {
                 pm_parser_err_token(parser, &opening, PM_ERR_STRING_LITERAL_TERM);
                 node = (pm_node_t *) pm_string_node_create_unescaped(parser, &opening, &content, &parser->current, &unescaped);
@@ -14000,7 +14084,7 @@ parse_strings(pm_parser_t *parser, pm_node_t *current) {
                 pm_node_flag_set(node, parse_unescaped_encoding(parser));
                 expect1(parser, PM_TOKEN_STRING_END, PM_ERR_STRING_LITERAL_TERM);
             } else if (accept1(parser, PM_TOKEN_LABEL_END)) {
-                node = (pm_node_t *) pm_symbol_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped);
+                node = (pm_node_t *) pm_symbol_node_create_unescaped(parser, &opening, &content, &parser->previous, &unescaped, parse_symbol_encoding(parser, &unescaped));
             } else {
                 // If we get here, then we have interpolation so we'll need
                 // to create a string or symbol node with interpolation.
@@ -14373,7 +14457,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
                 match1(parser, PM_TOKEN_PARENTHESIS_LEFT) ||
                 (accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR))) ||
                 (pm_accepts_block_stack_p(parser) && match1(parser, PM_TOKEN_KEYWORD_DO)) ||
-		match1(parser, PM_TOKEN_BRACE_LEFT)
+                match1(parser, PM_TOKEN_BRACE_LEFT)
             ) {
                 pm_arguments_t arguments = { 0 };
                 parse_arguments_list(parser, &arguments, true, accepts_command_call);
@@ -14498,7 +14582,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
                 if (
                     (accepts_command_call && (token_begins_expression_p(parser->current.type) || match3(parser, PM_TOKEN_UAMPERSAND, PM_TOKEN_USTAR, PM_TOKEN_USTAR_STAR))) ||
                     (pm_accepts_block_stack_p(parser) && match1(parser, PM_TOKEN_KEYWORD_DO)) ||
-		    match1(parser, PM_TOKEN_BRACE_LEFT)
+                    match1(parser, PM_TOKEN_BRACE_LEFT)
                 ) {
                     pm_arguments_t arguments = { 0 };
                     parse_arguments_list(parser, &arguments, true, accepts_command_call);
@@ -14835,11 +14919,11 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
                     // for guard clauses in the form of `if` or `unless` statements.
                     if (accept1(parser, PM_TOKEN_KEYWORD_IF_MODIFIER)) {
                         pm_token_t keyword = parser->previous;
-                        pm_node_t *predicate = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, true, PM_ERR_CONDITIONAL_IF_PREDICATE);
+                        pm_node_t *predicate = parse_value_expression(parser, PM_BINDING_POWER_COMPOSITION, true, PM_ERR_CONDITIONAL_IF_PREDICATE);
                         pattern = (pm_node_t *) pm_if_node_modifier_create(parser, pattern, &keyword, predicate);
                     } else if (accept1(parser, PM_TOKEN_KEYWORD_UNLESS_MODIFIER)) {
                         pm_token_t keyword = parser->previous;
-                        pm_node_t *predicate = parse_value_expression(parser, PM_BINDING_POWER_DEFINED, true, PM_ERR_CONDITIONAL_UNLESS_PREDICATE);
+                        pm_node_t *predicate = parse_value_expression(parser, PM_BINDING_POWER_COMPOSITION, true, PM_ERR_CONDITIONAL_UNLESS_PREDICATE);
                         pattern = (pm_node_t *) pm_unless_node_modifier_create(parser, pattern, &keyword, predicate);
                     }
 
@@ -15379,6 +15463,13 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
             pm_parser_scope_pop(parser);
             pm_parser_current_param_name_restore(parser, saved_param_name);
 
+            /**
+             * If the final character is @. As is the case when defining
+             * methods to override the unary operators, we should ignore
+             * the @ in the same way we do for symbols.
+             */
+            name.end = parse_operator_symbol_name(&name);
+
             return (pm_node_t *) pm_def_node_create(
                 parser,
                 &name,
@@ -17862,7 +17953,7 @@ pm_parser_errors_format_sort(const pm_list_t *error_list, const pm_newline_list_
         if (start.line == end.line) {
             column_end = (uint32_t) end.column;
         } else {
-            column_end = (uint32_t) (newline_list->offsets[start.line + 1] - newline_list->offsets[start.line] - 1);
+            column_end = (uint32_t) (newline_list->offsets[start.line] - newline_list->offsets[start.line - 1] - 1);
         }
 
         // Ensure we have at least one column of error.
@@ -17881,16 +17972,16 @@ pm_parser_errors_format_sort(const pm_list_t *error_list, const pm_newline_list_
 
 static inline void
 pm_parser_errors_format_line(const pm_parser_t *parser, const pm_newline_list_t *newline_list, const char *number_prefix, size_t line, pm_buffer_t *buffer) {
-    const uint8_t *start = &parser->start[newline_list->offsets[line]];
+    const uint8_t *start = &parser->start[newline_list->offsets[line - 1]];
     const uint8_t *end;
 
-    if (line + 1 >= newline_list->size) {
+    if (line >= newline_list->size) {
         end = parser->end;
     } else {
-        end = &parser->start[newline_list->offsets[line + 1]];
+        end = &parser->start[newline_list->offsets[line]];
     }
 
-    pm_buffer_append_format(buffer, number_prefix, (uint32_t) (line + 1));
+    pm_buffer_append_format(buffer, number_prefix, (uint32_t) line);
     pm_buffer_append_string(buffer, (const char *) start, (size_t) (end - start));
 
     if (end == parser->end && end[-1] != '\n') {
@@ -17915,7 +18006,7 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col
     // blank lines based on the maximum number of digits in the line numbers
     // that are going to be displayed.
     pm_error_format_t error_format;
-    size_t max_line_number = errors[error_list->size - 1].line + 1;
+    size_t max_line_number = errors[error_list->size - 1].line;
 
     if (max_line_number < 10) {
         if (colorize) {
@@ -17997,7 +18088,7 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col
     // the source before the error to give some context. We'll be careful not to
     // display the same line twice in case the errors are close enough in the
     // source.
-    uint32_t last_line = (uint32_t) -1;
+    uint32_t last_line = 0;
     const pm_encoding_t *encoding = parser->encoding;
 
     for (size_t index = 0; index < error_list->size; index++) {
@@ -18043,7 +18134,7 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col
         pm_buffer_append_string(buffer, error_format.blank_prefix, error_format.blank_prefix_length);
 
         size_t column = 0;
-        const uint8_t *start = &parser->start[newline_list->offsets[error->line]];
+        const uint8_t *start = &parser->start[newline_list->offsets[error->line - 1]];
 
         while (column < error->column_end) {
             if (column < error->column_start) {
@@ -18067,7 +18158,7 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col
         // Here we determine how many lines of padding to display after the
         // error, depending on where the next error is in source.
         last_line = error->line;
-        size_t next_line = (index == error_list->size - 1) ? newline_list->size - 1 : errors[index + 1].line;
+        size_t next_line = (index == error_list->size - 1) ? newline_list->size : errors[index + 1].line;
 
         if (next_line - last_line > 1) {
             pm_buffer_append_string(buffer, "  ", 2);
diff --git a/src/main/c/yarp/src/serialize.c b/src/main/c/yarp/src/serialize.c
index 3582cbfaca38..d285a3db5780 100644
--- a/src/main/c/yarp/src/serialize.c
+++ b/src/main/c/yarp/src/serialize.c
@@ -130,11 +130,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
         }
         case PM_ASSOC_NODE: {
             pm_serialize_node(parser, (pm_node_t *)((pm_assoc_node_t *)node)->key, buffer);
-            if (((pm_assoc_node_t *)node)->value == NULL) {
-                pm_buffer_append_byte(buffer, 0);
-            } else {
-                pm_serialize_node(parser, (pm_node_t *)((pm_assoc_node_t *)node)->value, buffer);
-            }
+            pm_serialize_node(parser, (pm_node_t *)((pm_assoc_node_t *)node)->value, buffer);
             break;
         }
         case PM_ASSOC_SPLAT_NODE: {
@@ -1361,6 +1357,8 @@ pm_serialize_diagnostic(pm_parser_t *parser, pm_diagnostic_t *diagnostic, pm_buf
 
     // serialize location
     pm_serialize_location(parser, &diagnostic->location, buffer);
+
+    pm_buffer_append_byte(buffer, diagnostic->level);
 }
 
 static void
@@ -1383,7 +1381,7 @@ pm_serialize_encoding(const pm_encoding_t *encoding, pm_buffer_t *buffer) {
     pm_buffer_append_string(buffer, encoding->name, encoding_length);
 }
 
-#line 216 "serialize.c.erb"
+#line 218 "serialize.c.erb"
 /**
  * Serialize the encoding, metadata, nodes, and constant pool.
  */
diff --git a/src/main/c/yarp/src/util/pm_newline_list.c b/src/main/c/yarp/src/util/pm_newline_list.c
index 32a4a050fe6c..724d840dd279 100644
--- a/src/main/c/yarp/src/util/pm_newline_list.c
+++ b/src/main/c/yarp/src/util/pm_newline_list.c
@@ -62,7 +62,7 @@ pm_newline_list_line_column(const pm_newline_list_t *list, const uint8_t *cursor
         size_t mid = left + (right - left) / 2;
 
         if (list->offsets[mid] == offset) {
-            return ((pm_line_column_t) { mid, 0 });
+            return ((pm_line_column_t) { mid + 1, 0 });
         }
 
         if (list->offsets[mid] < offset) {
@@ -72,7 +72,7 @@ pm_newline_list_line_column(const pm_newline_list_t *list, const uint8_t *cursor
         }
     }
 
-    return ((pm_line_column_t) { left - 1, offset - list->offsets[left - 1] });
+    return ((pm_line_column_t) { left, offset - list->offsets[left - 1] });
 }
 
 /**
diff --git a/src/yarp/java/org/prism/Loader.java b/src/yarp/java/org/prism/Loader.java
index ce4614834570..21c06a0c89ab 100644
--- a/src/yarp/java/org/prism/Loader.java
+++ b/src/yarp/java/org/prism/Loader.java
@@ -181,8 +181,9 @@ private ParseResult.Error[] loadSyntaxErrors() {
             byte[] bytes = loadEmbeddedString();
             String message = new String(bytes, StandardCharsets.US_ASCII);
             Nodes.Location location = loadLocation();
+            ParseResult.ErrorLevel level = ParseResult.ERROR_LEVELS[buffer.get()];
 
-            ParseResult.Error error = new ParseResult.Error(message, location);
+            ParseResult.Error error = new ParseResult.Error(message, location, level);
             errors[i] = error;
         }
 
@@ -198,8 +199,9 @@ private ParseResult.Warning[] loadWarnings() {
             byte[] bytes = loadEmbeddedString();
             String message = new String(bytes, StandardCharsets.US_ASCII);
             Nodes.Location location = loadLocation();
+            ParseResult.WarningLevel level = ParseResult.WARNING_LEVELS[buffer.get()];
 
-            ParseResult.Warning warning = new ParseResult.Warning(message, location);
+            ParseResult.Warning warning = new ParseResult.Warning(message, location, level);
             warnings[i] = warning;
         }
 
@@ -315,7 +317,7 @@ private Nodes.Node loadNode() {
             case 7:
                 return new Nodes.ArrayPatternNode(loadOptionalNode(), loadNodes(), loadOptionalNode(), loadNodes(), startOffset, length);
             case 8:
-                return new Nodes.AssocNode(loadNode(), loadOptionalNode(), startOffset, length);
+                return new Nodes.AssocNode(loadNode(), loadNode(), startOffset, length);
             case 9:
                 return new Nodes.AssocSplatNode(loadOptionalNode(), startOffset, length);
             case 10:
diff --git a/src/yarp/java/org/prism/Nodes.java b/src/yarp/java/org/prism/Nodes.java
index dfb1e1cdcefe..e6697ba1e1a7 100644
--- a/src/yarp/java/org/prism/Nodes.java
+++ b/src/yarp/java/org/prism/Nodes.java
@@ -1054,8 +1054,7 @@ protected String toString(String indent) {
     public static final class AndNode extends Node {
         /**
          * 
-         * Represents the left side of the expression. It can be any kind of node
-         * that represents a non-void expression.
+         * Represents the left side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
          *
          *     left and right
          *     ^^^^
@@ -1067,8 +1066,7 @@ public static final class AndNode extends Node {
         public final Node left;
         /**
          * 
-         * Represents the right side of the expression. It can be any kind of
-         * node that represents a non-void expression.
+         * Represents the right side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
          *
          *     left && right
          *             ^^^^^
@@ -1176,8 +1174,7 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents an array literal. This can be a regular array using brackets or
-     * a special array using % like %w or %i.
+     * Represents an array literal. This can be a regular array using brackets or a special array using % like %w or %i.
      *
      *     [1, 2, 3]
      *     ^^^^^^^^^
@@ -1337,8 +1334,7 @@ protected String toString(String indent) {
     public static final class AssocNode extends Node {
         /**
          * 
-         * The key of the association. This can be any node that represents a
-         * non-void expression.
+         * The key of the association. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
          *
          *     { a: b }
          *       ^
@@ -1353,9 +1349,7 @@ public static final class AssocNode extends Node {
         public final Node key;
         /**
          * 
-         * The value of the association, if present. This can be any node that
-         * represents a non-void expression. It can be optionally omitted if this
-         * node is an element in a `HashPatternNode`.
+         * The value of the association, if present. This can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
          *
          *     { foo => bar }
          *              ^^^
@@ -1364,7 +1358,6 @@ public static final class AssocNode extends Node {
          *          ^
          * 

          */
-        @Nullable
         public final Node value;
 
         public AssocNode(Node key, Node value, int startOffset, int length) {
@@ -1375,9 +1368,7 @@ public AssocNode(Node key, Node value, int startOffset, int length) {
                 
         public  void visitChildNodes(AbstractNodeVisitor visitor) {
             this.key.accept(visitor);
-            if (this.value != null) {
-                this.value.accept(visitor);
-            }
+            this.value.accept(visitor);
         }
 
         public Node[] childNodes() {
@@ -1402,7 +1393,7 @@ protected String toString(String indent) {
             builder.append(this.key.toString(nextIndent));
             builder.append(nextIndent);
             builder.append("value: ");
-            builder.append(this.value == null ? "null\n" : this.value.toString(nextIndent));
+            builder.append(this.value.toString(nextIndent));
             return builder.toString();
         }
     }
@@ -1416,8 +1407,7 @@ protected String toString(String indent) {
     public static final class AssocSplatNode extends Node {
         /**
          * 
-         * The value to be splatted, if present. Will be missing when keyword
-         * rest argument forwarding is used.
+         * The value to be splatted, if present. Will be missing when keyword rest argument forwarding is used.
          *
          *     { **foo }
          *         ^^^
@@ -1468,6 +1458,15 @@ protected String toString(String indent) {
      *     ^^
      */
     public static final class BackReferenceReadNode extends Node {
+        /**
+         * 
+         * The name of the back-reference variable, including the leading `$`.
+         *
+         *     $& # name `:$&`
+         *
+         *     $+ # name `:$+`
+         * 

+         */
         public final String name;
 
         public BackReferenceReadNode(String name, int startOffset, int length) {
@@ -2021,9 +2020,7 @@ public static final class CallNode extends Node {
         public final short flags;
         /**
          * 
-         * The object that the method is being called on. This can be either
-         * `nil` or a node representing any kind of expression that returns a
-         * non-void value.
+         * The object that the method is being called on. This can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
          *
          *     foo.bar
          *     ^^^
@@ -2796,6 +2793,15 @@ protected String toString(String indent) {
      *     ^^^^^
      */
     public static final class ClassVariableReadNode extends Node {
+        /**
+         * 
+         * The name of the class variable, which is a `@@` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+         *
+         *     @@abc   # name `:@@abc`
+         *
+         *     @@_test # name `:@@_test`
+         * 

+         */
         public final String name;
 
         public ClassVariableReadNode(String name, int startOffset, int length) {
@@ -3384,6 +3390,15 @@ protected String toString(String indent) {
      *     ^^^
      */
     public static final class ConstantReadNode extends Node {
+        /**
+         * 
+         * The name of the [constant](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#constants).
+         *
+         *     X              # name `:X`
+         *
+         *     SOME_CONSTANT  # name `:SOME_CONSTANT`
+         * 

+         */
         public final String name;
 
         public ConstantReadNode(String name, int startOffset, int length) {
@@ -3420,8 +3435,7 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents writing to a constant in a context that doesn't have an
-     * explicit value.
+     * Represents writing to a constant in a context that doesn't have an explicit value.
      *
      *     Foo, Bar = baz
      *     ^^^  ^^^
@@ -4370,6 +4384,15 @@ protected String toString(String indent) {
      *     ^^^^
      */
     public static final class GlobalVariableReadNode extends Node {
+        /**
+         * 
+         * The name of the global variable, which is a `$` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifier). Alternatively, it can be one of the special global variables designated by a symbol.
+         *
+         *     $foo   # name `:$foo`
+         *
+         *     $_Test # name `:$_Test`
+         * 

+         */
         public final String name;
 
         public GlobalVariableReadNode(String name, int startOffset, int length) {
@@ -4738,14 +4761,16 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents a node that is implicitly being added to the tree but doesn't
-     * correspond directly to a node in the source.
+     * Represents a node that is implicitly being added to the tree but doesn't correspond directly to a node in the source.
      *
      *     { foo: }
      *       ^^^^
      *
      *     { Foo: }
      *       ^^^^
+     *
+     *     foo in { bar: }
+     *              ^^^^
      */
     public static final class ImplicitNode extends Node {
         public final Node value;
@@ -5405,6 +5430,15 @@ protected String toString(String indent) {
      *     ^^^^
      */
     public static final class InstanceVariableReadNode extends Node {
+        /**
+         * 
+         * The name of the instance variable, which is a `@` followed by an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+         *
+         *     @x     # name `:@x`
+         *
+         *     @_test # name `:@_test`
+         * 

+         */
         public final String name;
 
         public InstanceVariableReadNode(String name, int startOffset, int length) {
@@ -5589,9 +5623,7 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents a regular expression literal that contains interpolation that
-     * is being used in the predicate of a conditional to implicitly match
-     * against the last line read by an IO object.
+     * Represents a regular expression literal that contains interpolation that is being used in the predicate of a conditional to implicitly match against the last line read by an IO object.
      *
      *     if /foo #{bar} baz/ then end
      *        ^^^^^^^^^^^^^^^^
@@ -6320,16 +6352,41 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents reading a local variable. Note that this requires that a local
-     * variable of the same name has already been written to in the same scope,
-     * otherwise it is parsed as a method call. Note that `it` default parameter
-     * has `0it` as the name of this node.
+     * Represents reading a local variable. Note that this requires that a local variable of the same name has already been written to in the same scope, otherwise it is parsed as a method call.
      *
      *     foo
      *     ^^^
      */
     public static final class LocalVariableReadNode extends Node {
+        /**
+         * 
+         * The name of the local variable, which is an [identifier](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#identifiers).
+         *
+         *     x      # name `:x`
+         *
+         *     _Test  # name `:_Test`
+         *
+         * Note that this can also be an underscore followed by a number for the default block parameters.
+         *
+         *     _1     # name `:_1`
+         *
+         * Finally, for the default `it` block parameter, the name is `0it`. This is to distinguish it from an `it` local variable that is explicitly declared.
+         *
+         *     it     # name `:0it`
+         * 

+         */
         public final String name;
+        /**
+         * 
+         * The number of visible scopes that should be searched to find the origin of this local variable.
+         *
+         *     foo = 1; foo # depth 0
+         *
+         *     bar = 2; tap { bar } # depth 1
+         *
+         * The specific rules for calculating the depth may differ from individual Ruby implementations, as they are not specified by the language. For more information, see [the Prism documentation](https://github.com/ruby/prism/blob/main/docs/local_variable_depth.md).
+         * 

+         */
         public final int depth;
 
         public LocalVariableReadNode(String name, int depth, int startOffset, int length) {
@@ -6473,9 +6530,7 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents a regular expression literal used in the predicate of a
-     * conditional to implicitly match against the last line read by an IO
-     * object.
+     * Represents a regular expression literal used in the predicate of a conditional to implicitly match against the last line read by an IO object.
      *
      *     if /foo/i then end
      *        ^^^^^^
@@ -6663,8 +6718,7 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents writing local variables using a regular expression match with
-     * named capture groups.
+     * Represents writing local variables using a regular expression match with named capture groups.
      *
      *     /(?bar)/ =~ baz
      *     ^^^^^^^^^^^^^^^^^^^^
@@ -6721,8 +6775,7 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents a node that is missing from the source and results in a syntax
-     * error.
+     * Represents a node that is missing from the source and results in a syntax error.
      */
     public static final class MissingNode extends Node {
 
@@ -7090,8 +7143,7 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents an implicit set of parameters through the use of numbered
-     * parameters within a block or lambda.
+     * Represents an implicit set of parameters through the use of numbered parameters within a block or lambda.
      *
      *     -> { _1 + _2 }
      *     ^^^^^^^^^^^^^^
@@ -7139,6 +7191,17 @@ protected String toString(String indent) {
      *     ^^
      */
     public static final class NumberedReferenceReadNode extends Node {
+        /**
+         * 
+         * The (1-indexed, from the left) number of the capture group. Numbered references that would overflow a `uint32`  result in a `number` of exactly `2**32 - 1`.
+         *
+         *     $1          # number `1`
+         *
+         *     $5432       # number `5432`
+         *
+         *     $4294967296 # number `4294967295`
+         * 

+         */
         public final int number;
 
         public NumberedReferenceReadNode(int number, int startOffset, int length) {
@@ -7301,8 +7364,7 @@ protected String toString(String indent) {
     public static final class OrNode extends Node {
         /**
          * 
-         * Represents the left side of the expression. It can be any kind of node
-         * that represents a non-void expression.
+         * Represents the left side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
          *
          *     left or right
          *     ^^^^
@@ -7314,8 +7376,7 @@ public static final class OrNode extends Node {
         public final Node left;
         /**
          * 
-         * Represents the right side of the expression. It can be any kind of
-         * node that represents a non-void expression.
+         * Represents the right side of the expression. It can be any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
          *
          *     left || right
          *             ^^^^^
@@ -7532,8 +7593,7 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents the use of the `^` operator for pinning an expression in a
-     * pattern matching expression.
+     * Represents the use of the `^` operator for pinning an expression in a pattern matching expression.
      *
      *     foo in ^(bar)
      *            ^^^^^^
@@ -7575,8 +7635,7 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents the use of the `^` operator for pinning a variable in a pattern
-     * matching expression.
+     * Represents the use of the `^` operator for pinning a variable in a pattern matching expression.
      *
      *     foo in ^bar
      *            ^^^^
@@ -7768,9 +7827,7 @@ public static final class RangeNode extends Node {
         public final short flags;
         /**
          * 
-         * The left-hand side of the range, if present. Can be either `nil` or
-         * a node representing any kind of expression that returns a non-void
-         * value.
+         * The left-hand side of the range, if present. It can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
          *
          *     1...
          *     ^
@@ -7783,17 +7840,14 @@ public static final class RangeNode extends Node {
         public final Node left;
         /**
          * 
-         * The right-hand side of the range, if present. Can be either `nil` or
-         * a node representing any kind of expression that returns a non-void
-         * value.
+         * The right-hand side of the range, if present. It can be either `nil` or any [non-void expression](https://github.com/ruby/prism/blob/main/docs/parsing_rules.md#non-void-expression).
          *
          *     ..5
          *       ^
          *
          *     1...foo
          *         ^^^
-         * If neither right-hand or left-hand side was included, this will be a
-         * MissingNode.
+         * If neither right-hand or left-hand side was included, this will be a MissingNode.
          * 

          */
         @Nullable
@@ -8188,8 +8242,7 @@ protected String toString(String indent) {
      *     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      *     end
      *
-     * `Foo, *splat, Bar` are in the `exceptions` field.
-     * `ex` is in the `exception` field.
+     * `Foo, *splat, Bar` are in the `exceptions` field. `ex` is in the `exception` field.
      */
     public static final class RescueNode extends Node {
         public final Node[] exceptions;
@@ -8704,8 +8757,7 @@ protected String toString(String indent) {
     }
 
     /**
-     * Represents a string literal, a string contained within a `%w` list, or
-     * plain string content within an interpolated string.
+     * Represents a string literal, a string contained within a `%w` list, or plain string content within an interpolated string.
      *
      *     "foo"
      *     ^^^^^
diff --git a/src/yarp/java/org/prism/ParseResult.java b/src/yarp/java/org/prism/ParseResult.java
index 6dadbe898266..a652394d4e78 100644
--- a/src/yarp/java/org/prism/ParseResult.java
+++ b/src/yarp/java/org/prism/ParseResult.java
@@ -13,23 +13,43 @@ public MagicComment(Nodes.Location keyLocation, Nodes.Location valueLocation) {
         }
     }
 
+    public enum ErrorLevel {
+        /** For errors that cannot be recovered from. */
+        ERROR_FATAL
+    }
+
+    public static ErrorLevel[] ERROR_LEVELS = ErrorLevel.values();
+
     public static final class Error {
         public final String message;
         public final Nodes.Location location;
+        public final ErrorLevel level;
 
-        public Error(String message, Nodes.Location location) {
+        public Error(String message, Nodes.Location location, ErrorLevel level) {
             this.message = message;
             this.location = location;
+            this.level = level;
         }
     }
 
+    public enum WarningLevel {
+        /** For warnings which should be emitted if $VERBOSE != nil. */
+        WARNING_DEFAULT,
+        /** For warnings which should be emitted if $VERBOSE == true. */
+        WARNING_VERBOSE
+    }
+
+    public static WarningLevel[] WARNING_LEVELS = WarningLevel.values();
+
     public static final class Warning {
         public final String message;
         public final Nodes.Location location;
+        public final WarningLevel level;
 
-        public Warning(String message, Nodes.Location location) {
+        public Warning(String message, Nodes.Location location, WarningLevel level) {
             this.message = message;
             this.location = location;
+            this.level = level;
         }
     }
 

From 65fdebaee53af87daf6b3dfb185517b5f62dacb8 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sat, 27 Jan 2024 20:08:21 +0100
Subject: [PATCH 093/131] Adopt WarningLevel from Prism

---
 .../java/org/truffleruby/parser/YARPTranslatorDriver.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index be275a17aa3b..84a107ad1adf 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -480,7 +480,10 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
             SourceSection section = rubySource.getSource().createSection(location.startOffset, location.length);
             int lineNumber = RubySource.getStartLineAdjusted(context, section);
 
-            rubyWarnings.warning(filename, lineNumber, warning.message);
+            switch (warning.level) {
+                case WARNING_DEFAULT -> rubyWarnings.warn(filename, lineNumber, warning.message);
+                case WARNING_VERBOSE -> rubyWarnings.warning(filename, lineNumber, warning.message);
+            }
         }
 
         if (errors.length != 0) {

From a6f5a6f7060c5ebcbd55311bc24cc24e4cf9b5dc Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sat, 27 Jan 2024 15:24:29 +0100
Subject: [PATCH 094/131] Introduce YARPBaseTranslator

---
 .../parser/TranslatorEnvironment.java         |   6 +
 .../parser/YARPBaseTranslator.java            | 232 ++++++++++++++++++
 .../parser/YARPBlockNodeTranslator.java       |  17 +-
 .../parser/YARPDefNodeTranslator.java         |  12 +-
 .../parser/YARPExecutedOnceExpression.java    |   1 +
 .../parser/YARPLoadArgumentsTranslator.java   |  22 +-
 .../parser/YARPMultiTargetNodeTranslator.java |   1 +
 .../parser/YARPMultiWriteNodeTranslator.java  |   1 +
 ...ParametersNodeToDestructureTranslator.java |  16 +-
 .../parser/YARPReloadArgumentsTranslator.java |  27 +-
 .../truffleruby/parser/YARPTranslator.java    | 196 ++-------------
 .../parser/YARPTranslatorDriver.java          |   5 +-
 12 files changed, 296 insertions(+), 240 deletions(-)
 create mode 100644 src/main/java/org/truffleruby/parser/YARPBaseTranslator.java

diff --git a/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java b/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java
index d2a73a2ec5f6..fc72012f7990 100644
--- a/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java
+++ b/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java
@@ -276,6 +276,12 @@ public ReadLocalVariableNode readNode(int slot, SourceIndexLength sourceSection)
         return node;
     }
 
+    public ReadLocalVariableNode readNode(int slot, Nodes.Node yarpNode) {
+        var node = new ReadLocalVariableNode(LocalVariableType.FRAME_LOCAL, slot);
+        node.unsafeSetSourceSection(yarpNode.startOffset, yarpNode.length);
+        return node;
+    }
+
     public RubyNode findLocalVarOrNilNode(String name, SourceIndexLength sourceSection) {
         RubyNode node = findLocalVarNode(name, sourceSection);
         if (node == null) {
diff --git a/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
new file mode 100644
index 000000000000..7b40eaddcff8
--- /dev/null
+++ b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.parser;
+
+import java.util.List;
+
+import org.prism.AbstractNodeVisitor;
+import org.prism.Nodes;
+import org.truffleruby.RubyLanguage;
+import org.truffleruby.core.DummyNode;
+import org.truffleruby.core.encoding.RubyEncoding;
+import org.truffleruby.core.encoding.TStringUtils;
+import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyNode;
+import org.truffleruby.language.arguments.NoKeywordArgumentsDescriptor;
+import org.truffleruby.language.control.SequenceNode;
+import org.truffleruby.language.dispatch.RubyCallNodeParameters;
+import org.truffleruby.language.literal.NilLiteralNode;
+
+import com.oracle.truffle.api.TruffleSafepoint;
+import com.oracle.truffle.api.source.Source;
+import com.oracle.truffle.api.source.SourceSection;
+import com.oracle.truffle.api.strings.TruffleString;
+
+public abstract class YARPBaseTranslator extends AbstractNodeVisitor {
+
+    protected final RubyLanguage language;
+    protected final TranslatorEnvironment environment;
+    protected final RubySource rubySource;
+
+    // For convenient/concise access, actually redundant with the rubySource field
+    protected final Source source;
+    protected final byte[] sourceBytes;
+    protected final RubyEncoding sourceEncoding;
+
+    public static final Nodes.Node[] EMPTY_NODE_ARRAY = Nodes.Node.EMPTY_ARRAY;
+
+    public static final Nodes.ParametersNode ZERO_PARAMETERS_NODE = new Nodes.ParametersNode(EMPTY_NODE_ARRAY,
+            EMPTY_NODE_ARRAY, null, EMPTY_NODE_ARRAY, EMPTY_NODE_ARRAY, null, null, 0, 0);
+
+    public static final short NO_FLAGS = 0;
+
+    public YARPBaseTranslator(
+            RubyLanguage language,
+            TranslatorEnvironment environment,
+            RubySource rubySource) {
+        this.language = language;
+        this.environment = environment;
+        this.rubySource = rubySource;
+        this.source = rubySource.getSource();
+        this.sourceBytes = rubySource.getBytes();
+        this.sourceEncoding = rubySource.getEncoding();
+    }
+
+    public final TranslatorEnvironment getEnvironment() {
+        return environment;
+    }
+
+    @Override
+    protected RubyNode defaultVisit(Nodes.Node node) {
+        String code = toString(node);
+        throw new Error(
+                this.getClass().getSimpleName() + " does not know how to translate " + node.getClass().getSimpleName() +
+                        " at " + RubyLanguage.getCurrentContext().fileLine(getSourceSection(node)) +
+                        "\nCode snippet:\n" + code + "\nPrism AST:\n" + node);
+    }
+
+    protected static RubyNode[] createArray(int size) {
+        return size == 0 ? RubyNode.EMPTY_ARRAY : new RubyNode[size];
+    }
+
+    protected final RubyNode translateNodeOrNil(Nodes.Node node) {
+        final RubyNode rubyNode;
+        if (node == null) {
+            rubyNode = new NilLiteralNode();
+        } else {
+            rubyNode = node.accept(this);
+        }
+        return rubyNode;
+    }
+
+    protected final RubyNode translateNodeOrDeadNode(Nodes.Node node, String label) {
+        if (node != null) {
+            return node.accept(this);
+        } else {
+            return new DeadNode(label);
+        }
+    }
+
+    protected final RubyContextSourceNode createCallNode(RubyNode receiver, String method, RubyNode... arguments) {
+        return createCallNode(true, receiver, method, arguments);
+    }
+
+    protected final RubyContextSourceNode createCallNode(boolean ignoreVisibility, RubyNode receiver, String method,
+            RubyNode... arguments) {
+        var parameters = new RubyCallNodeParameters(
+                receiver,
+                method,
+                null,
+                NoKeywordArgumentsDescriptor.INSTANCE,
+                arguments,
+                ignoreVisibility);
+        return language.coreMethodAssumptions.createCallNode(parameters);
+    }
+
+    protected static Nodes.CallNode callNode(Nodes.Node location, Nodes.Node receiver, String methodName,
+            Nodes.Node... arguments) {
+        return callNode(location, NO_FLAGS, receiver, methodName, arguments);
+    }
+
+    protected static Nodes.CallNode callNode(Nodes.Node location, short flags, Nodes.Node receiver, String methodName,
+            Nodes.Node... arguments) {
+        return new Nodes.CallNode(flags, receiver, methodName,
+                new Nodes.ArgumentsNode(NO_FLAGS, arguments, location.startOffset, location.length), null,
+                location.startOffset, location.length);
+    }
+
+    protected final TruffleString toTString(Nodes.Node node) {
+        return TruffleString.fromByteArrayUncached(sourceBytes, node.startOffset, node.length, sourceEncoding.tencoding,
+                false);
+    }
+
+    protected final TruffleString toTString(String string) {
+        return TStringUtils.fromJavaString(string, sourceEncoding);
+    }
+
+    protected final String toString(Nodes.Node node) {
+        return TStringUtils.toJavaStringOrThrow(toTString(node), sourceEncoding);
+    }
+
+    protected final TruffleString toTString(byte[] bytes) {
+        return TruffleString.fromByteArrayUncached(bytes, sourceEncoding.tencoding, false);
+    }
+
+    protected final String toString(byte[] bytes) {
+        return TStringUtils.toJavaStringOrThrow(toTString(bytes), sourceEncoding);
+    }
+
+    protected final SourceSection getSourceSection(Nodes.Node yarpNode) {
+        return source.createSection(yarpNode.startOffset, yarpNode.length);
+    }
+
+    public final RubyNode assignPositionAndFlags(Nodes.Node yarpNode, RubyNode rubyNode) {
+        assignPositionOnly(yarpNode, rubyNode);
+        copyNewlineFlag(yarpNode, rubyNode);
+        return rubyNode;
+    }
+
+    public final RubyNode assignPositionAndFlagsIfMissing(Nodes.Node yarpNode, RubyNode rubyNode) {
+        if (rubyNode.hasSource()) {
+            return rubyNode;
+        }
+
+        assignPositionOnly(yarpNode, rubyNode);
+        copyNewlineFlag(yarpNode, rubyNode);
+        return rubyNode;
+    }
+
+    protected static void assignPositionOnly(Nodes.Node yarpNode, RubyNode rubyNode) {
+        rubyNode.unsafeSetSourceSection(yarpNode.startOffset, yarpNode.length);
+    }
+
+    // assign position based on a list of nodes (arguments list, exception classes list in a rescue section, etc)
+    protected final void assignPositionOnly(Nodes.Node[] nodes, RubyNode rubyNode) {
+        final Nodes.Node first = nodes[0];
+        final Nodes.Node last = nodes[nodes.length - 1];
+
+        final int length = last.endOffset() - first.startOffset;
+        rubyNode.unsafeSetSourceSection(first.startOffset, length);
+    }
+
+    protected final void copyNewlineFlag(Nodes.Node yarpNode, RubyNode rubyNode) {
+        if (yarpNode.hasNewLineFlag()) {
+            TruffleSafepoint.poll(DummyNode.INSTANCE);
+
+            if (environment.getParseEnvironment().isCoverageEnabled()) {
+                rubyNode.unsafeSetIsCoverageLine();
+                int startLine = environment.getParseEnvironment().yarpSource.line(yarpNode.startOffset);
+                language.coverageManager.setLineHasCode(source, startLine);
+            }
+
+            rubyNode.unsafeSetIsNewLine();
+        }
+    }
+
+    protected static RubyNode sequence(Nodes.Node yarpNode, List sequence) {
+        assert !yarpNode.hasNewLineFlag() : "Expected node passed to sequence() to not have a newline flag";
+
+        RubyNode sequenceNode = sequence(sequence);
+
+        if (!sequenceNode.hasSource()) {
+            assignPositionOnly(yarpNode, sequenceNode);
+        }
+
+        return sequenceNode;
+    }
+
+    protected static RubyNode sequence(List sequence) {
+        final List flattened = Translator.flatten(sequence, true);
+
+        if (flattened.isEmpty()) {
+            return new NilLiteralNode();
+        } else if (flattened.size() == 1) {
+            return flattened.get(0);
+        } else {
+            final RubyNode[] flatSequence = flattened.toArray(RubyNode.EMPTY_ARRAY);
+            return new SequenceNode(flatSequence);
+        }
+    }
+
+    protected final RubyNode[] translate(Nodes.Node[] nodes) {
+        if (nodes.length == 0) {
+            return RubyNode.EMPTY_ARRAY;
+        }
+
+        RubyNode[] rubyNodes = new RubyNode[nodes.length];
+
+        for (int i = 0; i < nodes.length; i++) {
+            rubyNodes[i] = nodes[i].accept(this);
+        }
+
+        return rubyNodes;
+    }
+
+}
diff --git a/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java
index ec8030723f7b..766fec6e3f20 100644
--- a/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java
@@ -12,7 +12,6 @@
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeUtil;
-import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 import org.prism.Nodes;
 import org.truffleruby.RubyLanguage;
@@ -20,7 +19,6 @@
 import org.truffleruby.core.IsNilNode;
 import org.truffleruby.core.cast.SplatCastNode;
 import org.truffleruby.core.cast.SplatCastNodeGen;
-import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.proc.ProcCallTargets;
 import org.truffleruby.core.proc.ProcType;
 import org.truffleruby.language.RubyLambdaRootNode;
@@ -45,18 +43,17 @@
 import java.util.function.Supplier;
 
 public final class YARPBlockNodeTranslator extends YARPTranslator {
+
     private final Arity arity;
 
     public YARPBlockNodeTranslator(
             RubyLanguage language,
             TranslatorEnvironment environment,
-            byte[] sourceBytes,
-            Source source,
-            RubyEncoding sourceEncoding,
+            RubySource rubySource,
             ParserContext parserContext,
             Node currentNode,
             Arity arity) {
-        super(language, environment, sourceBytes, source, sourceEncoding, parserContext, currentNode);
+        super(language, environment, rubySource, parserContext, currentNode);
         this.arity = arity;
     }
 
@@ -66,9 +63,10 @@ public RubyNode compileBlockNode(Nodes.Node body, Nodes.ParametersNode parameter
         declareLocalVariables(locals);
 
         final RubyNode loadArguments = new YARPLoadArgumentsTranslator(
-                parameters,
                 language,
                 environment,
+                rubySource,
+                parameters,
                 arity,
                 !isStabbyLambda,
                 false,
@@ -166,10 +164,11 @@ private RubyNode preludeProc(
             final RubyNode readArrayNode = new ReadLocalVariableNode(LocalVariableType.FRAME_LOCAL, arraySlot);
 
             final var translator = new YARPParametersNodeToDestructureTranslator(
+                    language,
+                    environment,
+                    rubySource,
                     parameters,
                     readArrayNode,
-                    environment,
-                    language,
                     this);
             final RubyNode newDestructureArguments = translator.translate();
 
diff --git a/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java
index 5339b0de3bd4..3d084d1f7c19 100644
--- a/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java
@@ -13,28 +13,25 @@
 
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.annotations.Split;
-import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.language.RubyMethodRootNode;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.methods.Arity;
 import org.truffleruby.language.methods.CachedLazyCallTargetSupplier;
 
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.source.Source;
 import org.prism.Nodes;
 
 public final class YARPDefNodeTranslator extends YARPTranslator {
+
     private final boolean shouldLazyTranslate;
 
     public YARPDefNodeTranslator(
             RubyLanguage language,
             TranslatorEnvironment environment,
-            byte[] sourceBytes,
-            Source source,
-            RubyEncoding sourceEncoding,
+            RubySource rubySource,
             ParserContext parserContext,
             Node currentNode) {
-        super(language, environment, sourceBytes, source, sourceEncoding, parserContext, currentNode);
+        super(language, environment, rubySource, parserContext, currentNode);
 
         if (parserContext.isEval() || environment.getParseEnvironment().isCoverageEnabled()) {
             shouldLazyTranslate = false;
@@ -49,9 +46,10 @@ private RubyNode compileMethodBody(Nodes.DefNode node, Nodes.ParametersNode para
         declareLocalVariables(node);
 
         final RubyNode loadArguments = new YARPLoadArgumentsTranslator(
-                parameters,
                 language,
                 environment,
+                rubySource,
+                parameters,
                 arity,
                 false,
                 true,
diff --git a/src/main/java/org/truffleruby/parser/YARPExecutedOnceExpression.java b/src/main/java/org/truffleruby/parser/YARPExecutedOnceExpression.java
index 4cbd55429ff5..17648427d126 100644
--- a/src/main/java/org/truffleruby/parser/YARPExecutedOnceExpression.java
+++ b/src/main/java/org/truffleruby/parser/YARPExecutedOnceExpression.java
@@ -18,6 +18,7 @@
 
 /** Similar to ValueFromNode class but for YARP nodes */
 public final class YARPExecutedOnceExpression {
+
     final String name;
     final int slot;
     final Nodes.Node node;
diff --git a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
index 97b41ceca0d4..a283715b7dba 100644
--- a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
@@ -29,16 +29,13 @@
 import org.truffleruby.language.locals.WriteLocalVariableNode;
 
 import org.truffleruby.language.methods.Arity;
-import org.prism.AbstractNodeVisitor;
 import org.prism.Nodes;
 
 /** Translates method/block parameters and assign local variables.
  *
  * Parameters should be iterated in the same order {@link org.truffleruby.parser.YARPReloadArgumentsTranslator} iterates
  * to handle multiple "_" parameters (and parameters with "_" prefix) correctly. */
-public final class YARPLoadArgumentsTranslator extends AbstractNodeVisitor {
-
-    private static final short NO_FLAGS = YARPTranslator.NO_FLAGS;
+public final class YARPLoadArgumentsTranslator extends YARPBaseTranslator {
 
     private final Arity arity;
     private final boolean isProc; // block or lambda/method
@@ -58,19 +55,16 @@ private enum State {
     private State state;
     private int repeatedParameterCounter = 2;
 
-    private final RubyLanguage language;
-    private final TranslatorEnvironment environment;
-
     public YARPLoadArgumentsTranslator(
-            Nodes.ParametersNode parameters,
             RubyLanguage language,
             TranslatorEnvironment environment,
+            RubySource rubySource,
+            Nodes.ParametersNode parameters,
             Arity arity,
             boolean isProc,
             boolean isMethod,
             YARPTranslator yarpTranslator) {
-        this.language = language;
-        this.environment = environment;
+        super(language, environment, rubySource);
         this.arity = arity;
         this.isProc = isProc;
         this.isMethod = isMethod;
@@ -98,8 +92,8 @@ public RubyNode translate() {
         }
 
         // Early return for the common case of zero parameters
-        if (parameters == YARPTranslator.ZERO_PARAMETERS_NODE) {
-            return YARPTranslator.sequence(sequence);
+        if (parameters == ZERO_PARAMETERS_NODE) {
+            return sequence(sequence);
         }
 
         if (parameters.optionals.length > 0) {
@@ -143,7 +137,7 @@ public RubyNode translate() {
             sequence.add(parameters.block.accept(this));
         }
 
-        return YARPTranslator.sequence(sequence);
+        return sequence(sequence);
     }
 
     public RubyNode saveMethodBlockArg() {
@@ -333,7 +327,7 @@ public RubyNode visitForwardingParameterNode(Nodes.ForwardingParameterNode node)
         sequence.add(keyrest.accept(this));
         sequence.add(block.accept(this));
 
-        return YARPTranslator.sequence(sequence);
+        return sequence(sequence);
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/parser/YARPMultiTargetNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPMultiTargetNodeTranslator.java
index 0a2088419b1a..203be3ea3dea 100644
--- a/src/main/java/org/truffleruby/parser/YARPMultiTargetNodeTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPMultiTargetNodeTranslator.java
@@ -24,6 +24,7 @@
 // Could be used in ordinal multi-assignment and for destructuring array argument in method/proc parameters:
 // - a, (b, c) = 1, [2, 3]
 // - def foo(a, (b, c)) end
+// NOTE: cannot inherit from YARPBaseTranslator because it returns AssignableNode instead of RubyNode.
 public final class YARPMultiTargetNodeTranslator extends AbstractNodeVisitor {
 
     private final Nodes.MultiTargetNode node;
diff --git a/src/main/java/org/truffleruby/parser/YARPMultiWriteNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPMultiWriteNodeTranslator.java
index 8ff1d31e6d04..2e69def80985 100644
--- a/src/main/java/org/truffleruby/parser/YARPMultiWriteNodeTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPMultiWriteNodeTranslator.java
@@ -20,6 +20,7 @@
 import org.truffleruby.core.cast.SplatCastNodeGen;
 import org.truffleruby.language.RubyNode;
 
+// NOTE: cannot inherit from YARPBaseTranslator because it returns AssignableNode instead of RubyNode.
 public final class YARPMultiWriteNodeTranslator extends AbstractNodeVisitor {
 
     private final Nodes.MultiWriteNode node;
diff --git a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java
index e857a5edaa85..43e22e00cb4d 100644
--- a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java
@@ -13,7 +13,6 @@
 import java.util.List;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import org.prism.AbstractNodeVisitor;
 import org.prism.Nodes;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayIndexNodes;
@@ -38,7 +37,7 @@
  * 

  * 
  * Based on org.truffleruby.parser.YARPLoadArgumentsTranslator */
-public final class YARPParametersNodeToDestructureTranslator extends AbstractNodeVisitor {
+public final class YARPParametersNodeToDestructureTranslator extends YARPBaseTranslator {
 
     private final YARPTranslator yarpTranslator;
 
@@ -54,21 +53,18 @@ private enum State {
     /** to distinguish pre and post Nodes.RequiredParameterNode parameters */
     private State state;
 
-    private final RubyLanguage language;
-    private final TranslatorEnvironment environment;
-
     private final RubyNode readArrayNode;
 
     public YARPParametersNodeToDestructureTranslator(
+            RubyLanguage language,
+            TranslatorEnvironment environment,
+            RubySource rubySource,
             Nodes.ParametersNode parameters,
             RubyNode readArrayNode,
-            TranslatorEnvironment environment,
-            RubyLanguage language,
             YARPTranslator yarpTranslator) {
+        super(language, environment, rubySource);
         this.parameters = parameters;
         this.readArrayNode = readArrayNode;
-        this.environment = environment;
-        this.language = language;
         this.yarpTranslator = yarpTranslator;
     }
 
@@ -128,7 +124,7 @@ public RubyNode translate() {
             sequence.add(parameters.block.accept(this));
         }
 
-        return YARPTranslator.sequence(sequence);
+        return sequence(sequence);
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java
index e01458459454..0655bef4a1d3 100644
--- a/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java
@@ -14,7 +14,6 @@
 import java.util.List;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import org.prism.AbstractNodeVisitor;
 import org.prism.Nodes;
 import org.truffleruby.Layouts;
 import org.truffleruby.RubyLanguage;
@@ -32,9 +31,8 @@
  *
  * Parameters should be iterated in the same order {@link org.truffleruby.parser.YARPLoadArgumentsTranslator} iterates
  * to handle multiple "_" parameters (and parameters with "_" prefix) correctly. */
-public final class YARPReloadArgumentsTranslator extends AbstractNodeVisitor {
+public final class YARPReloadArgumentsTranslator extends YARPBaseTranslator {
 
-    private final RubyLanguage language;
     private final YARPTranslator yarpTranslator;
     private final boolean hasKeywordArguments;
 
@@ -44,9 +42,11 @@ public final class YARPReloadArgumentsTranslator extends AbstractNodeVisitor 0 || parametersNode.keyword_rest != null;
     }
@@ -139,14 +139,11 @@ public RubyNode[] reload(Nodes.ParametersNode parameters) {
         if (parameters.keyword_rest instanceof Nodes.ForwardingParameterNode) {
             // ... parameter (so-called "forward arguments") means there is implicit * parameter
             restParameterIndex = parameters.requireds.length + parameters.optionals.length;
-            final var readRestNode = yarpTranslator.getEnvironment().findLocalVarNode(
-                    TranslatorEnvironment.FORWARDED_REST_NAME,
-                    null);
+            var readRestNode = environment.findLocalVarNode(TranslatorEnvironment.FORWARDED_REST_NAME, null);
             sequence.add(readRestNode);
 
             // ... parameter (so-called "forward arguments") means there is implicit ** parameter
-            final var readKeyRestNode = yarpTranslator.getEnvironment()
-                    .findLocalVarNode(TranslatorEnvironment.FORWARDED_KEYWORD_REST_NAME, null);
+            var readKeyRestNode = environment.findLocalVarNode(TranslatorEnvironment.FORWARDED_KEYWORD_REST_NAME, null);
             sequence.add(readKeyRestNode);
         }
 
@@ -163,7 +160,7 @@ public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) {
             name = node.name;
         }
 
-        return yarpTranslator.getEnvironment().findLocalVarNode(name, null);
+        return environment.findLocalVarNode(name, null);
     }
 
     @Override
@@ -176,7 +173,7 @@ public RubyNode visitOptionalParameterNode(Nodes.OptionalParameterNode node) {
             name = node.name;
         }
 
-        return yarpTranslator.getEnvironment().findLocalVarNode(name, null);
+        return environment.findLocalVarNode(name, null);
     }
 
     @Override
@@ -199,23 +196,23 @@ public RubyNode visitRestParameterNode(Nodes.RestParameterNode node) {
             name = TranslatorEnvironment.DEFAULT_REST_NAME;
         }
 
-        return yarpTranslator.getEnvironment().findLocalVarNode(name, null);
+        return environment.findLocalVarNode(name, null);
     }
 
     @Override
     public RubyNode visitRequiredKeywordParameterNode(Nodes.RequiredKeywordParameterNode node) {
-        return yarpTranslator.getEnvironment().findLocalVarNode(node.name, null);
+        return environment.findLocalVarNode(node.name, null);
     }
 
     @Override
     public RubyNode visitOptionalKeywordParameterNode(Nodes.OptionalKeywordParameterNode node) {
-        return yarpTranslator.getEnvironment().findLocalVarNode(node.name, null);
+        return environment.findLocalVarNode(node.name, null);
     }
 
     @Override
     public RubyNode visitKeywordRestParameterNode(Nodes.KeywordRestParameterNode node) {
         final String name = node.name != null ? node.name : TranslatorEnvironment.DEFAULT_KEYWORD_REST_NAME;
-        return yarpTranslator.getEnvironment().findLocalVarNode(name, null);
+        return environment.findLocalVarNode(name, null);
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index cd0bce0c5981..469db0dd23f9 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -10,11 +10,8 @@
 package org.truffleruby.parser;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeUtil;
-import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.strings.TruffleString;
 import org.jcodings.specific.EUCJPEncoding;
 import org.jcodings.specific.Windows_31JEncoding;
@@ -23,7 +20,6 @@
 import org.truffleruby.annotations.Split;
 import org.truffleruby.builtins.PrimitiveNodeConstructor;
 import org.truffleruby.core.CoreLibrary;
-import org.truffleruby.core.DummyNode;
 import org.truffleruby.core.IsNilNode;
 import org.truffleruby.core.array.ArrayConcatNode;
 import org.truffleruby.core.array.ArrayLiteralNode;
@@ -61,7 +57,6 @@
 import org.truffleruby.debug.ChaosNode;
 import org.truffleruby.language.LexicalScope;
 import org.truffleruby.language.NotProvided;
-import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.RubyRootNode;
 import org.truffleruby.language.RubyTopLevelRootNode;
@@ -149,7 +144,6 @@
 import org.truffleruby.language.objects.WriteInstanceVariableNodeGen;
 import org.truffleruby.language.objects.classvariables.ReadClassVariableNode;
 import org.truffleruby.language.objects.classvariables.WriteClassVariableNode;
-import org.prism.AbstractNodeVisitor;
 import org.prism.Nodes;
 import org.truffleruby.language.supercall.ReadSuperArgumentsNode;
 import org.truffleruby.language.supercall.ReadZSuperArgumentsNode;
@@ -177,33 +171,19 @@
 // * there is typically no need for such an object since YARP location info is correct.
 
 /** Translate (or convert) AST provided by a parser (YARP parser) to Truffle AST */
-public class YARPTranslator extends AbstractNodeVisitor {
-
-    protected final RubyLanguage language;
-    protected final TranslatorEnvironment environment;
-    // TODO: Since these fields don't seem to change per translator instance we could/should store them in ParseEnvironment
-    private final ParserContext parserContext;
-    private final byte[] sourceBytes;
-    private final Source source;
-    private final Node currentNode;
-    private final RubyEncoding sourceEncoding;
-
-    public Deque frameOnStackMarkerSlotStack = new ArrayDeque<>();
+public class YARPTranslator extends YARPBaseTranslator {
 
     public static final int NO_FRAME_ON_STACK_MARKER = Translator.NO_FRAME_ON_STACK_MARKER;
 
-    public static final Nodes.Node[] EMPTY_NODE_ARRAY = Nodes.Node.EMPTY_ARRAY;
-    public static final Nodes.ParametersNode ZERO_PARAMETERS_NODE = new Nodes.ParametersNode(EMPTY_NODE_ARRAY,
-            EMPTY_NODE_ARRAY, null, EMPTY_NODE_ARRAY, EMPTY_NODE_ARRAY, null, null, 0, 0);
-
     public static final RescueNode[] EMPTY_RESCUE_NODE_ARRAY = new RescueNode[0];
 
-    public static final short NO_FLAGS = 0;
-
+    // TODO: Since these fields don't seem to change per translator instance we could/should store them in ParseEnvironment
+    private final ParserContext parserContext;
+    private final Node currentNode;
+    public Deque frameOnStackMarkerSlotStack = new ArrayDeque<>();
     private boolean translatingWhile = false;
-
     private boolean translatingNextExpression = false;
-    @SuppressWarnings("unused") private boolean translatingForStatement = false;
+    private boolean translatingForStatement = false;
 
     private static final String[] numberedParameterNames = {
             null,
@@ -224,30 +204,14 @@ public class YARPTranslator extends AbstractNodeVisitor {
     public YARPTranslator(
             RubyLanguage language,
             TranslatorEnvironment environment,
-            byte[] sourceBytes,
-            Source source,
-            RubyEncoding sourceEncoding,
+            RubySource rubySource,
             ParserContext parserContext,
             Node currentNode) {
-        this.language = language;
-        this.environment = environment;
-        this.sourceBytes = sourceBytes;
-        this.source = source;
-
-        if (sourceEncoding != null) {
-            this.sourceEncoding = sourceEncoding;
-        } else {
-            this.sourceEncoding = Encodings.UTF_8;
-        }
-
+        super(language, environment, rubySource);
         this.parserContext = parserContext;
         this.currentNode = currentNode;
     }
 
-    public TranslatorEnvironment getEnvironment() {
-        return environment;
-    }
-
     public ArrayList getBeginBlocks() {
         return beginBlocks;
     }
@@ -576,9 +540,7 @@ private RubyNode translateBlockAndLambda(Nodes.Node node, Nodes.Node parametersN
         final YARPBlockNodeTranslator methodCompiler = new YARPBlockNodeTranslator(
                 language,
                 newEnvironment,
-                sourceBytes,
-                source,
-                sourceEncoding,
+                rubySource,
                 parserContext,
                 currentNode,
                 arity);
@@ -975,7 +937,7 @@ public RubyNode visitCaseNode(Nodes.CaseNode node) {
         if (node.predicate != null) {
             // Evaluate the case expression and store it in a local
             final int tempSlot = environment.declareLocalTemp("case");
-            final ReadLocalNode readTemp = environment.readNode(tempSlot, null);
+            final ReadLocalNode readTemp = environment.readNode(tempSlot, node);
             final RubyNode assignTemp = readTemp.makeWriteNode(node.predicate.accept(this));
 
             // Build an if expression from `when` and `else` branches.
@@ -1526,9 +1488,7 @@ public RubyNode visitDefNode(Nodes.DefNode node) {
         final var defNodeTranslator = new YARPDefNodeTranslator(
                 language,
                 newEnvironment,
-                sourceBytes,
-                source,
-                sourceEncoding,
+                rubySource,
                 parserContext,
                 currentNode);
         var callTargetSupplier = defNodeTranslator.buildMethodNodeCompiler(node, parameters, arity);
@@ -1800,7 +1760,9 @@ public RubyNode visitForwardingSuperNode(Nodes.ForwardingSuperNode node) {
             // parametersNode == null for a method means zero parameters: https://github.com/ruby/prism/issues/1915
             parametersNode = ZERO_PARAMETERS_NODE;
         }
-        var reloadTranslator = new YARPReloadArgumentsTranslator(language, this, parametersNode);
+        // TODO should this use `environment` and not `this.environment`? But that fails some specs
+        var reloadTranslator = new YARPReloadArgumentsTranslator(language, this.environment, rubySource, this,
+                parametersNode);
 
         final RubyNode[] reloadSequence = reloadTranslator.reload(parametersNode);
 
@@ -3234,15 +3196,6 @@ public RubyNode visitYieldNode(Nodes.YieldNode node) {
         return assignPositionAndFlags(node, rubyNode);
     }
 
-    @Override
-    protected RubyNode defaultVisit(Nodes.Node node) {
-        String code = toString(node);
-        throw new Error(
-                this.getClass().getSimpleName() + " does not know how to translate " + node.getClass().getSimpleName() +
-                        " at " + RubyLanguage.getCurrentContext().fileLine(getSourceSection(node)) +
-                        "\nCode snippet:\n" + code + "\nPrism AST:\n" + node);
-    }
-
     /** Declare variable in the nearest non-block outer lexical scope - either method, class or top-level */
     protected FrameSlotAndDepth createFlipFlopState() {
         final var target = environment.getSurroundingMethodOrEvalEnvironment();
@@ -3391,9 +3344,7 @@ private RubyNode openModule(Nodes.Node moduleNode, RubyNode defineOrGetNode, Str
         final YARPTranslator moduleTranslator = new YARPTranslator(
                 language,
                 newEnvironment,
-                sourceBytes,
-                source,
-                sourceEncoding,
+                rubySource,
                 parserContext,
                 currentNode);
 
@@ -3522,24 +3473,6 @@ private boolean shouldUseDynamicConstantLookupForModuleBody(Nodes.Node node) {
         }
     }
 
-    protected RubyNode translateNodeOrNil(Nodes.Node node) {
-        final RubyNode rubyNode;
-        if (node == null) {
-            rubyNode = new NilLiteralNode();
-        } else {
-            rubyNode = node.accept(this);
-        }
-        return rubyNode;
-    }
-
-    protected RubyNode translateNodeOrDeadNode(Nodes.Node node, String label) {
-        if (node != null) {
-            return node.accept(this);
-        } else {
-            return new DeadNode(label);
-        }
-    }
-
     private boolean isInvalidYield() {
         return environment.getSurroundingMethodEnvironment().isModuleBody(); // so not inside a method
     }
@@ -3610,22 +3543,6 @@ private RubyNode translateWhileNode(Nodes.Node node, Nodes.Node predicate, Nodes
         return rubyNode;
     }
 
-    protected RubyContextSourceNode createCallNode(RubyNode receiver, String method, RubyNode... arguments) {
-        return createCallNode(true, receiver, method, arguments);
-    }
-
-    protected RubyContextSourceNode createCallNode(boolean ignoreVisibility, RubyNode receiver, String method,
-            RubyNode... arguments) {
-        var parameters = new RubyCallNodeParameters(
-                receiver,
-                method,
-                null,
-                NoKeywordArgumentsDescriptor.INSTANCE,
-                arguments,
-                ignoreVisibility);
-        return language.coreMethodAssumptions.createCallNode(parameters);
-    }
-
     protected boolean isSideEffectFreeRescueExpression(Nodes.Node node) {
         return node instanceof Nodes.InstanceVariableReadNode ||
                 node instanceof Nodes.LocalVariableReadNode ||
@@ -3643,75 +3560,6 @@ protected boolean isSideEffectFreeRescueExpression(Nodes.Node node) {
                 node instanceof Nodes.NilNode;
     }
 
-    protected TruffleString toTString(Nodes.Node node) {
-        return TruffleString.fromByteArrayUncached(sourceBytes, node.startOffset, node.length, sourceEncoding.tencoding,
-                false);
-    }
-
-    protected TruffleString toTString(String string) {
-        return TStringUtils.fromJavaString(string, sourceEncoding);
-    }
-
-    protected String toString(Nodes.Node node) {
-        return TStringUtils.toJavaStringOrThrow(toTString(node), sourceEncoding);
-    }
-
-    protected TruffleString toTString(byte[] bytes) {
-        return TruffleString.fromByteArrayUncached(bytes, sourceEncoding.tencoding, false);
-    }
-
-    protected String toString(byte[] bytes) {
-        return TStringUtils.toJavaStringOrThrow(
-                toTString(bytes), sourceEncoding);
-    }
-
-    protected SourceSection getSourceSection(Nodes.Node yarpNode) {
-        return source.createSection(yarpNode.startOffset, yarpNode.length);
-    }
-
-    public RubyNode assignPositionAndFlags(Nodes.Node yarpNode, RubyNode rubyNode) {
-        assignPositionOnly(yarpNode, rubyNode);
-        copyNewlineFlag(yarpNode, rubyNode);
-        return rubyNode;
-    }
-
-    public RubyNode assignPositionAndFlagsIfMissing(Nodes.Node yarpNode, RubyNode rubyNode) {
-        if (rubyNode.hasSource()) {
-            return rubyNode;
-        }
-
-        assignPositionOnly(yarpNode, rubyNode);
-        copyNewlineFlag(yarpNode, rubyNode);
-        return rubyNode;
-    }
-
-    private static void assignPositionOnly(Nodes.Node yarpNode, RubyNode rubyNode) {
-        rubyNode.unsafeSetSourceSection(yarpNode.startOffset, yarpNode.length);
-    }
-
-    // assign position based on a list of nodes (arguments list, exception classes list in a rescue section, etc)
-    private void assignPositionOnly(Nodes.Node[] nodes, RubyNode rubyNode) {
-        final Nodes.Node first = nodes[0];
-        final Nodes.Node last = nodes[nodes.length - 1];
-
-        final int length = last.endOffset() - first.startOffset;
-        rubyNode.unsafeSetSourceSection(first.startOffset, length);
-    }
-
-    private void copyNewlineFlag(Nodes.Node yarpNode, RubyNode rubyNode) {
-        if (yarpNode.hasNewLineFlag()) {
-            TruffleSafepoint.poll(DummyNode.INSTANCE);
-
-            if (environment.getParseEnvironment().isCoverageEnabled()) {
-                rubyNode.unsafeSetIsCoverageLine();
-                int startLine = environment.getParseEnvironment().yarpSource.line(yarpNode.startOffset);
-                language.coverageManager.setLineHasCode(source, startLine);
-            }
-
-            rubyNode.unsafeSetIsNewLine();
-        }
-    }
-
     protected static RubyNode sequence(Nodes.Node yarpNode, List sequence) {
         assert !yarpNode.hasNewLineFlag() : "Expected node passed to sequence() to not have a newline flag";
 
@@ -3761,20 +3609,6 @@ private boolean containYARPSplatNode(Nodes.Node[] nodes) {
         return false;
     }
 
-    private RubyNode[] translate(Nodes.Node[] nodes) {
-        if (nodes.length == 0) {
-            return RubyNode.EMPTY_ARRAY;
-        }
-
-        RubyNode[] rubyNodes = new RubyNode[nodes.length];
-
-        for (int i = 0; i < nodes.length; i++) {
-            rubyNodes[i] = nodes[i].accept(this);
-        }
-
-        return rubyNodes;
-    }
-
     private ArgumentDescriptor[] parametersNodeToArgumentDescriptors(Nodes.ParametersNode parametersNode) {
         if (parametersNode == ZERO_PARAMETERS_NODE) {
             return ArgumentDescriptor.EMPTY_ARRAY;
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index 84a107ad1adf..0c888b08fd1e 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -252,13 +252,10 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
         // Translate to Ruby Truffle nodes
 
         // use source encoding detected by manually, before source file is fully parsed
-        byte[] sourceBytes = rubySource.getBytes();
         final YARPTranslator translator = new YARPTranslator(
                 language,
                 environment,
-                sourceBytes,
-                source,
-                rubySource.getEncoding(),
+                rubySource,
                 parserContext,
                 currentNode);
 

From 7ff628f59bc57d38df37c17b2374108bc8384ede Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sat, 27 Jan 2024 15:42:22 +0100
Subject: [PATCH 095/131] Add YARPPatternMatchingTranslator based on
 PatternMatchingTranslator

* But with several cleanups and fixes.
* Also allow Prism error messages in pattern matching specs.
---
 spec/ruby/language/pattern_matching_spec.rb   |  25 ++-
 spec/tags/language/pattern_matching_tags.txt  |  56 +-----
 .../java/org/truffleruby/parser/DeadNode.java |   9 +-
 .../parser/YARPBaseTranslator.java            |  12 +-
 .../parser/YARPPatternMatchingTranslator.java | 180 ++++++++++++++++++
 .../truffleruby/parser/YARPTranslator.java    |  70 ++++++-
 6 files changed, 272 insertions(+), 80 deletions(-)
 create mode 100644 src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java

diff --git a/spec/ruby/language/pattern_matching_spec.rb b/spec/ruby/language/pattern_matching_spec.rb
index 050a8a052d2e..25f8d61efcb2 100644
--- a/spec/ruby/language/pattern_matching_spec.rb
+++ b/spec/ruby/language/pattern_matching_spec.rb
@@ -207,7 +207,7 @@
         in []
         end
       RUBY
-    }.should raise_error(SyntaxError, /syntax error, unexpected `in'|\(eval\):3: syntax error, unexpected keyword_in/)
+    }.should raise_error(SyntaxError, /syntax error, unexpected `in'|\(eval\):3: syntax error, unexpected keyword_in|cannot parse the expression/)
 
     -> {
       eval <<~RUBY
@@ -216,7 +216,7 @@
         when 1 == 1
         end
       RUBY
-    }.should raise_error(SyntaxError, /syntax error, unexpected `when'|\(eval\):3: syntax error, unexpected keyword_when/)
+    }.should raise_error(SyntaxError, /syntax error, unexpected `when'|\(eval\):3: syntax error, unexpected keyword_when|cannot parse the expression/)
   end
 
   it "checks patterns until the first matching" do
@@ -273,7 +273,7 @@
           true
         end
       RUBY
-    }.should raise_error(SyntaxError, /unexpected/)
+    }.should raise_error(SyntaxError, /unexpected|expected a delimiter after the predicates of a `when` clause/)
   end
 
   it "evaluates the case expression once for multiple patterns, caching the result" do
@@ -1398,15 +1398,26 @@ def ===(obj)
       RUBY
 
       eval(<<~RUBY).should == true
-        case {name: '2.6', released_at: Time.new(2018, 12, 25)}
-          in {released_at: ^(Time.new(2010)..Time.new(2020))}
+        case 0
+        in ^(0+0)
           true
         end
       RUBY
+    end
 
+    it "supports pinning expressions in array pattern" do
       eval(<<~RUBY).should == true
-        case 0
-        in ^(0+0)
+        case [3]
+        in [^(1+2)]
+          true
+        end
+      RUBY
+    end
+
+    it "supports pinning expressions in hash pattern" do
+      eval(<<~RUBY).should == true
+        case {name: '2.6', released_at: Time.new(2018, 12, 25)}
+          in {released_at: ^(Time.new(2010)..Time.new(2020))}
           true
         end
       RUBY
diff --git a/spec/tags/language/pattern_matching_tags.txt b/spec/tags/language/pattern_matching_tags.txt
index 21d1e3107db7..e4f5f38e4cbc 100644
--- a/spec/tags/language/pattern_matching_tags.txt
+++ b/spec/tags/language/pattern_matching_tags.txt
@@ -1,12 +1,9 @@
 fails:Pattern matching variable pattern supports using any name with _ at the beginning in a pattern several times
-fails:Pattern matching variable pattern supports existing variables in a pattern specified with ^ operator
-fails:Pattern matching variable pattern allows applying ^ operator to bound variables
 fails:Pattern matching alternative pattern matches if any of patterns matches
 fails:Pattern matching alternative pattern does not support variable binding
 fails:Pattern matching alternative pattern support underscore prefixed variables in alternation
 fails:Pattern matching AS pattern binds a variable to a value if pattern matches
 fails:Pattern matching AS pattern can be used as a nested pattern
-fails:Pattern matching Array pattern supports form Constant(pat, pat, ...)
 fails:Pattern matching Hash pattern supports form id: pat, id: pat, ...
 fails:Pattern matching Hash pattern supports a: which means a: a
 fails:Pattern matching Hash pattern can mix key (a:) and key-value (a: b) declarations
@@ -24,7 +21,6 @@ fails:Pattern matching Hash pattern treats **nil like there should not be any ot
 fails:Pattern matching Hash pattern matches anything with **
 fails:Pattern matching refinements are used for #deconstruct_keys
 fails:Pattern matching Array pattern accepts a subclass of Array from #deconstruct
-fails:Pattern matching can be standalone assoc operator that deconstructs value
 fails:Pattern matching Array pattern calls #deconstruct once for multiple patterns, caching the result
 fails:Pattern matching find pattern captures both preceding and following elements to the pattern
 fails:Pattern matching warning when one-line form warns about pattern matching is experimental feature
@@ -36,11 +32,6 @@ fails:Pattern matching find pattern can be nested with an array pattern
 fails:Pattern matching find pattern can be nested within a hash pattern
 fails:Pattern matching find pattern can nest hash and array patterns
 fails:Pattern matching can omit parentheses in one line pattern matching
-fails:Pattern matching supports pinning instance variables
-fails:Pattern matching supports pinning class variables
-fails:Pattern matching supports pinning global variables
-fails:Pattern matching supports pinning expressions
-fails:Pattern matching warning when one-line form does not warn about pattern matching is experimental feature
 fails:Pattern matching Hash pattern supports form Constant(id: pat, id: pat, ...)
 fails:Pattern matching Hash pattern supports form Constant[id: pat, id: pat, ...]
 fails:Pattern matching Hash pattern supports form {id: pat, id: pat, ...}
@@ -50,53 +41,8 @@ fails:Pattern matching Hash pattern calls #deconstruct_keys per pattern
 fails:Pattern matching Hash pattern can match partially
 fails:Pattern matching Hash pattern matches {} with {}
 fails:Pattern matching refinements are used for #deconstruct
-fails:Pattern matching can be standalone assoc operator that deconstructs value and properly scopes variables
-fails:Pattern matching extends case expression with case/in construction
-fails:Pattern matching allows using then operator
-fails:Pattern matching binds variables
-fails:Pattern matching cannot mix in and when operators
-fails:Pattern matching checks patterns until the first matching
-fails:Pattern matching executes else clause if no pattern matches
-fails:Pattern matching raises NoMatchingPatternError if no pattern matches and no else clause
-fails:Pattern matching raises NoMatchingPatternError if no pattern matches and evaluates the expression only once
-fails:Pattern matching does not allow calculation or method calls in a pattern
-fails:Pattern matching evaluates the case expression once for multiple patterns, caching the result
-fails:Pattern matching find pattern captures preceding elements to the pattern
-fails:Pattern matching find pattern captures following elements to the pattern
-fails:Pattern matching find pattern can capture the entirety of the pattern
-fails:Pattern matching find pattern will match an empty Array-like structure
-fails:Pattern matching warning when regular form does not warn about pattern matching is experimental feature
-fails:Pattern matching guards supports if guard
-fails:Pattern matching guards supports unless guard
-fails:Pattern matching guards makes bound variables visible in guard
-fails:Pattern matching guards does not evaluate guard if pattern does not match
-fails:Pattern matching guards takes guards into account when there are several matching patterns
-fails:Pattern matching guards executes else clause if no guarded pattern matches
-fails:Pattern matching guards raises NoMatchingPatternError if no guarded pattern matches and no else clause
-fails:Pattern matching value pattern matches an object such that pattern === object
-fails:Pattern matching value pattern allows string literal with interpolation
-fails:Pattern matching variable pattern matches a value and binds variable name to this value
-fails:Pattern matching variable pattern makes bounded variable visible outside a case statement scope
-fails:Pattern matching variable pattern create local variables even if a pattern doesn't match
-fails:Pattern matching variable pattern allow using _ name to drop values
-fails:Pattern matching variable pattern supports using _ in a pattern several times
 fails:Pattern matching variable pattern does not support using variable name (except _) several times
-fails:Pattern matching Array pattern supports form Constant[pat, pat, ...]
-fails:Pattern matching Array pattern supports form [pat, pat, ...]
-fails:Pattern matching Array pattern supports form pat, pat, ...
-fails:Pattern matching Array pattern matches an object with #deconstruct method which returns an array and each element in array matches element in pattern
-fails:Pattern matching Array pattern calls #deconstruct even on objects that are already an array
-fails:Pattern matching Array pattern does not match object if Constant === object returns false
-fails:Pattern matching Array pattern does not match object without #deconstruct method
-fails:Pattern matching Array pattern raises TypeError if #deconstruct method does not return array
-fails:Pattern matching Array pattern does not match object if elements of array returned by #deconstruct method does not match elements in pattern
-fails:Pattern matching Array pattern binds variables
-fails:Pattern matching Array pattern supports splat operator *rest
-fails:Pattern matching Array pattern does not match partially by default
-fails:Pattern matching Array pattern does match partially from the array beginning if list + , syntax used
-fails:Pattern matching Array pattern matches [] with []
-fails:Pattern matching Array pattern matches anything with *
 fails:Pattern matching Hash pattern does not support non-symbol keys
 fails:Pattern matching Hash pattern does not support string interpolation in keys
 fails:Pattern matching Hash pattern raise SyntaxError when keys duplicate in pattern
-fails:Pattern matching refinements are used for #=== in constant pattern
+fails:Pattern matching supports pinning expressions in hash pattern
diff --git a/src/main/java/org/truffleruby/parser/DeadNode.java b/src/main/java/org/truffleruby/parser/DeadNode.java
index a6bc9e224e8b..664baac0d8be 100644
--- a/src/main/java/org/truffleruby/parser/DeadNode.java
+++ b/src/main/java/org/truffleruby/parser/DeadNode.java
@@ -9,9 +9,9 @@
  */
 package org.truffleruby.parser;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import org.truffleruby.language.RubyContextSourceNode;
 
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import org.truffleruby.language.RubyNode;
 
@@ -27,12 +27,7 @@ public DeadNode(String reason) {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        throw exception();
-    }
-
-    @TruffleBoundary
-    private RuntimeException exception() {
-        return new UnsupportedOperationException(reason);
+        throw CompilerDirectives.shouldNotReachHere(reason);
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
index 7b40eaddcff8..da98784e93a2 100644
--- a/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
@@ -20,6 +20,7 @@
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.arguments.NoKeywordArgumentsDescriptor;
+import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.control.SequenceNode;
 import org.truffleruby.language.dispatch.RubyCallNodeParameters;
 import org.truffleruby.language.literal.NilLiteralNode;
@@ -65,11 +66,14 @@ public final TranslatorEnvironment getEnvironment() {
 
     @Override
     protected RubyNode defaultVisit(Nodes.Node node) {
+        var context = RubyLanguage.getCurrentContext();
         String code = toString(node);
-        throw new Error(
-                this.getClass().getSimpleName() + " does not know how to translate " + node.getClass().getSimpleName() +
-                        " at " + RubyLanguage.getCurrentContext().fileLine(getSourceSection(node)) +
-                        "\nCode snippet:\n" + code + "\nPrism AST:\n" + node);
+        var message = this.getClass().getSimpleName() + " does not know how to translate " +
+                node.getClass().getSimpleName() + " at " + context.fileLine(getSourceSection(node)) +
+                "\nCode snippet:\n" + code + "\nPrism AST:\n" + node;
+        throw new RaiseException(context,
+                context.getCoreExceptions().syntaxError(message, null, getSourceSection(node)));
+        // throw new Error(message);
     }
 
     protected static RubyNode[] createArray(int size) {
diff --git a/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
new file mode 100644
index 000000000000..8947445e3264
--- /dev/null
+++ b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2013, 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.parser;
+
+import java.util.Arrays;
+
+import com.oracle.truffle.api.CompilerDirectives;
+import org.prism.Nodes;
+import org.truffleruby.RubyLanguage;
+import org.truffleruby.core.array.ArrayIndexNodes;
+import org.truffleruby.core.array.ArrayPatternLengthCheckNode;
+import org.truffleruby.core.array.ArraySliceNodeGen;
+import org.truffleruby.language.RubyNode;
+import org.truffleruby.language.control.AndNodeGen;
+import org.truffleruby.language.control.ExecuteAndReturnTrueNode;
+import org.truffleruby.language.control.NotNodeGen;
+import org.truffleruby.language.literal.TruffleInternalModuleLiteralNode;
+import org.truffleruby.language.locals.ReadLocalNode;
+import org.truffleruby.language.locals.WriteLocalNode;
+
+
+/** Translate the pattern of pattern matching. Executing the translated node must result in true or false. Every visit
+ * method here should return a node which is the condition of whether it matched. Visit methods can change & restore
+ * {@code currentValueToMatch} to change which expression is being matched against. */
+public final class YARPPatternMatchingTranslator extends YARPBaseTranslator {
+
+    private final YARPTranslator yarpTranslator;
+
+    private RubyNode currentValueToMatch;
+
+    public YARPPatternMatchingTranslator(
+            RubyLanguage language,
+            TranslatorEnvironment environment,
+            RubySource rubySource,
+            YARPTranslator yarpTranslator) {
+        super(language, environment, rubySource);
+        this.yarpTranslator = yarpTranslator;
+    }
+
+    public RubyNode translatePatternNode(Nodes.Node patternNode, RubyNode expressionValue) {
+        currentValueToMatch = expressionValue;
+        return patternNode.accept(this);
+    }
+
+    @Override
+    public RubyNode visitIfNode(Nodes.IfNode node) { // a guard like `in [a] if a.even?`
+        assert node.statements.body.length == 1;
+        var pattern = node.statements.body[0].accept(this);
+        var condition = node.predicate.accept(yarpTranslator); // translate after the pattern which might introduce new variables
+        return AndNodeGen.create(pattern, condition);
+    }
+
+    @Override
+    public RubyNode visitUnlessNode(Nodes.UnlessNode node) { // a guard like `in [a] unless a.even?`
+        assert node.statements.body.length == 1;
+        var pattern = node.statements.body[0].accept(this);
+        var condition = NotNodeGen.create(node.predicate.accept(yarpTranslator)); // translate after the pattern which might introduce new variables
+        return AndNodeGen.create(pattern, condition);
+    }
+
+    @Override
+    public RubyNode visitArrayPatternNode(Nodes.ArrayPatternNode node) {
+        var preNodes = node.requireds;
+        var restNode = node.rest;
+        var postNodes = node.posts;
+
+        int preSize = preNodes.length;
+        int postSize = postNodes.length;
+
+        var deconstructed = createCallNode(new TruffleInternalModuleLiteralNode(), "deconstruct_checked",
+                currentValueToMatch);
+
+        final int deconstructedSlot = environment.declareLocalTemp("pattern_deconstruct_array");
+        final ReadLocalNode readTemp = environment.readNode(deconstructedSlot, node);
+        final RubyNode assignTemp = readTemp.makeWriteNode(deconstructed);
+        currentValueToMatch = readTemp;
+
+        RubyNode condition = new ArrayPatternLengthCheckNode(preSize + postSize,
+                currentValueToMatch, restNode != null);
+
+        if (node.constant != null) { // Constant[a]
+            condition = AndNodeGen.create(matchValue(node.constant), condition);
+        }
+
+        for (int i = 0; i < preNodes.length; i++) {
+            var preNode = preNodes[i];
+
+            RubyNode prev = currentValueToMatch;
+            currentValueToMatch = ArrayIndexNodes.ReadConstantIndexNode.create(currentValueToMatch, i);
+            try {
+                condition = AndNodeGen.create(condition, preNode.accept(this));
+            } finally {
+                currentValueToMatch = prev;
+            }
+        }
+
+        if (restNode != null) {
+            if (restNode instanceof Nodes.SplatNode splatNode) {
+                if (splatNode.expression != null) {
+                    RubyNode prev = currentValueToMatch;
+                    currentValueToMatch = ArraySliceNodeGen.create(preSize, -postSize, currentValueToMatch);
+                    try {
+                        condition = AndNodeGen.create(condition, splatNode.expression.accept(this));
+                    } finally {
+                        currentValueToMatch = prev;
+                    }
+                } else { // in [1, *, 2]
+                    // Nothing
+                }
+            } else if (restNode instanceof Nodes.ImplicitRestNode) { // in [0, 1,]
+                // Nothing
+            } else {
+                throw CompilerDirectives.shouldNotReachHere(node.getClass().getName());
+            }
+        }
+
+        for (int i = 0; i < postNodes.length; i++) {
+            var postNode = postNodes[i];
+            int index = -postNodes.length + i;
+            RubyNode prev = currentValueToMatch;
+            currentValueToMatch = ArrayIndexNodes.ReadConstantIndexNode.create(currentValueToMatch, index);
+            try {
+                condition = AndNodeGen.create(condition, postNode.accept(this));
+            } finally {
+                currentValueToMatch = prev;
+            }
+        }
+
+        return YARPTranslator.sequence(node, Arrays.asList(assignTemp, condition));
+    }
+
+    @Override
+    public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
+        // var deconstructed = createCallNode(currentValueToMatch, "deconstruct_keys", new NilLiteralNode());
+
+        // Not correct, the pattern cannot always be represented as a runtime value and this overflows the stack:
+        //        return createCallNode(
+        //                new TruffleInternalModuleLiteralNode(),
+        //                "hash_pattern_matches?",
+        //                node.accept(this),
+        //                NodeUtil.cloneNode(deconstructed));
+
+        return defaultVisit(node);
+    }
+
+    @Override
+    public RubyNode visitLocalVariableTargetNode(Nodes.LocalVariableTargetNode node) {
+        WriteLocalNode writeLocalNode = yarpTranslator.visitLocalVariableTargetNode(node);
+        writeLocalNode.setValueNode(currentValueToMatch);
+        return new ExecuteAndReturnTrueNode(writeLocalNode);
+    }
+
+    @Override
+    public RubyNode visitPinnedVariableNode(Nodes.PinnedVariableNode node) {
+        return matchValue(node.variable);
+    }
+
+    @Override
+    public RubyNode visitPinnedExpressionNode(Nodes.PinnedExpressionNode node) {
+        return matchValue(node.expression);
+    }
+
+    @Override
+    protected RubyNode defaultVisit(Nodes.Node node) {
+        return matchValue(node);
+    }
+
+    private RubyNode matchValue(Nodes.Node value) {
+        RubyNode translatedValue = value.accept(yarpTranslator);
+        return createCallNode(translatedValue, "===", currentValueToMatch);
+    }
+
+}
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index 469db0dd23f9..64fac6025caf 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -81,6 +81,7 @@
 import org.truffleruby.language.control.InvalidReturnNode;
 import org.truffleruby.language.control.LocalReturnNode;
 import org.truffleruby.language.control.NextNode;
+import org.truffleruby.language.control.NoMatchingPatternNodeGen;
 import org.truffleruby.language.control.NotNodeGen;
 import org.truffleruby.language.control.OnceNode;
 import org.truffleruby.language.control.OrLazyValueDefinedNodeGen;
@@ -922,8 +923,47 @@ public RubyNode visitCapturePatternNode(Nodes.CapturePatternNode node) {
     @Override
     public RubyNode visitCaseMatchNode(Nodes.CaseMatchNode node) {
         var context = RubyLanguage.getCurrentContext();
-        throw new RaiseException(context, context.getCoreExceptions()
-                .syntaxError("`case/in` pattern matching not yet implemented", currentNode, getSourceSection(node)));
+        if (!context.getOptions().PATTERN_MATCHING) {
+            throw new RaiseException(context, context.getCoreExceptions().syntaxError(
+                    "`case/in` pattern matching not yet implemented", currentNode, getSourceSection(node)));
+        }
+
+        var translator = new YARPPatternMatchingTranslator(language, environment, rubySource, this);
+
+        // Evaluate the case expression and store it in a local
+        final int tempSlot = environment.declareLocalTemp("case in value");
+        final ReadLocalNode readTemp = environment.readNode(tempSlot, node);
+        final RubyNode assignTemp = readTemp.makeWriteNode(node.predicate.accept(this));
+
+        /* Build an if expression from the in's and else. Work backwards because the first IfElseNode contains all the
+         * others in its else clause. */
+
+        RubyNode elseNode;
+        if (node.consequent == null) {
+            elseNode = NoMatchingPatternNodeGen.create(readTemp);
+        } else {
+            elseNode = node.consequent.accept(this);
+        }
+
+        for (int n = node.conditions.length - 1; n >= 0; n--) {
+            Nodes.InNode inNode = (Nodes.InNode) node.conditions[n];
+            Nodes.Node patternNode = inNode.pattern;
+
+            final RubyNode conditionNode = translator.translatePatternNode(patternNode, readTemp);
+            // Create the if node
+            final RubyNode thenNode = translateNodeOrNil(inNode.statements);
+            final IfElseNode ifNode = IfElseNodeGen.create(conditionNode, thenNode, elseNode);
+
+            // This if becomes the else for the next if
+            elseNode = ifNode;
+        }
+
+        final RubyNode ifNode = elseNode;
+
+        // A top-level block assigns the temp then runs the if
+        final RubyNode ret = sequence(Arrays.asList(assignTemp, ifNode));
+
+        return assignPositionAndFlags(node, ret);
     }
 
     @Override
@@ -2471,7 +2511,7 @@ public RubyNode visitLocalVariableOrWriteNode(Nodes.LocalVariableOrWriteNode nod
     }
 
     @Override
-    public RubyNode visitLocalVariableWriteNode(Nodes.LocalVariableWriteNode node) {
+    public WriteLocalNode visitLocalVariableWriteNode(Nodes.LocalVariableWriteNode node) {
         final String name = node.name;
 
         if (environment.getNeverAssignInParentScope()) {
@@ -2499,11 +2539,12 @@ public RubyNode visitLocalVariableWriteNode(Nodes.LocalVariableWriteNode node) {
         final RubyNode rhs = translateNodeOrDeadNode(node.value, "YARPTranslator#visitLocalVariableWriteNode");
         final WriteLocalNode rubyNode = lhs.makeWriteNode(rhs);
 
-        return assignPositionAndFlags(node, rubyNode);
+        assignPositionAndFlags(node, rubyNode);
+        return rubyNode;
     }
 
     @Override
-    public RubyNode visitLocalVariableTargetNode(Nodes.LocalVariableTargetNode node) {
+    public WriteLocalNode visitLocalVariableTargetNode(Nodes.LocalVariableTargetNode node) {
         // TODO: this could be done more directly but the logic of visitLocalVariableWriteNode() needs to be simpler first
         return visitLocalVariableWriteNode(
                 new Nodes.LocalVariableWriteNode(node.name, node.depth, null, node.startOffset, node.length));
@@ -2529,8 +2570,23 @@ public RubyNode visitMatchPredicateNode(Nodes.MatchPredicateNode node) {
     @Override
     public RubyNode visitMatchRequiredNode(Nodes.MatchRequiredNode node) {
         var context = RubyLanguage.getCurrentContext();
-        throw new RaiseException(context, context.getCoreExceptions()
-                .syntaxError("`=>` pattern matching not yet implemented", currentNode, getSourceSection(node)));
+        if (!context.getOptions().PATTERN_MATCHING) {
+            throw new RaiseException(context, context.getCoreExceptions()
+                    .syntaxError("`=>` pattern matching not yet implemented", currentNode, getSourceSection(node)));
+        }
+
+        var translator = new YARPPatternMatchingTranslator(language, environment, rubySource, this);
+
+        // Evaluate the expression and store it in a local
+        final int tempSlot = environment.declareLocalTemp("value_of_=>");
+        final ReadLocalNode readTemp = environment.readNode(tempSlot, node);
+        final RubyNode assignTemp = readTemp.makeWriteNode(node.value.accept(this));
+
+        RubyNode condition = translator.translatePatternNode(node.pattern, readTemp);
+        RubyNode check = UnlessNodeGen.create(condition, NoMatchingPatternNodeGen.create(NodeUtil.cloneNode(readTemp)));
+
+        final RubyNode ret = sequence(Arrays.asList(assignTemp, check));
+        return assignPositionAndFlags(node, ret);
     }
 
     // See BodyTranslator#visitMatch2Node

From 11d5b5774cb8f65ee4e19f0d9f1631b22dd37eb6 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sat, 27 Jan 2024 19:20:36 +0100
Subject: [PATCH 096/131] Implement Hash pattern matching and the rest of
 pattern matching

---
 spec/ruby/language/pattern_matching_spec.rb   |  10 +-
 spec/tags/language/pattern_matching_tags.txt  |  38 ---
 .../core/array/ArrayDeconstructNode.java      |  60 +++++
 .../array/ArrayPatternLengthCheckNode.java    |  41 ++--
 .../core/array/ArrayStaticLiteralNode.java    |  46 ++++
 .../core/hash/HashDeconstructKeysNode.java    |  64 +++++
 .../core/hash/HashGetOrUndefinedNode.java     |  54 +++++
 .../core/hash/HashIsEmptyNode.java            |  35 +++
 .../core/hash/HashPatternLengthCheckNode.java |  43 ++++
 .../core/hash/HashSubtractKeysNode.java       |  68 ++++++
 .../truffleruby/core/kernel/KernelNodes.java  |   2 +-
 .../core/support/IsNotUndefinedNode.java      |  40 ++++
 .../truffleruby/core/support/TypeNodes.java   |   2 +-
 .../truffleruby/core/symbol/CoreSymbols.java  |   2 +
 .../language/dispatch/DispatchNode.java       |   6 +-
 .../parser/PatternMatchingTranslator.java     |  10 +-
 .../parser/YARPBaseTranslator.java            |  16 +-
 .../parser/YARPPatternMatchingTranslator.java | 225 +++++++++++++-----
 .../truffleruby/parser/YARPTranslator.java    |  12 +-
 .../ruby/truffleruby/core/truffle/internal.rb |  19 --
 tool/generate-core-symbols.rb                 |   2 +
 21 files changed, 636 insertions(+), 159 deletions(-)
 create mode 100644 src/main/java/org/truffleruby/core/array/ArrayDeconstructNode.java
 create mode 100644 src/main/java/org/truffleruby/core/array/ArrayStaticLiteralNode.java
 create mode 100644 src/main/java/org/truffleruby/core/hash/HashDeconstructKeysNode.java
 create mode 100644 src/main/java/org/truffleruby/core/hash/HashGetOrUndefinedNode.java
 create mode 100644 src/main/java/org/truffleruby/core/hash/HashIsEmptyNode.java
 create mode 100644 src/main/java/org/truffleruby/core/hash/HashPatternLengthCheckNode.java
 create mode 100644 src/main/java/org/truffleruby/core/hash/HashSubtractKeysNode.java
 create mode 100644 src/main/java/org/truffleruby/core/support/IsNotUndefinedNode.java

diff --git a/spec/ruby/language/pattern_matching_spec.rb b/spec/ruby/language/pattern_matching_spec.rb
index 25f8d61efcb2..f64a700cd79c 100644
--- a/spec/ruby/language/pattern_matching_spec.rb
+++ b/spec/ruby/language/pattern_matching_spec.rb
@@ -770,11 +770,7 @@ def obj.deconstruct; "" end
     it "accepts a subclass of Array from #deconstruct" do
       obj = Object.new
       def obj.deconstruct
-        subarray = Class.new(Array).new(2)
-        def subarray.[](n)
-          n
-        end
-        subarray
+        Class.new(Array).new([0, 1])
       end
 
       eval(<<~RUBY).should == true
@@ -1004,7 +1000,7 @@ def obj.deconstruct; [1] end
           in {"a" => 1}
           end
         RUBY
-      }.should raise_error(SyntaxError, /unexpected/)
+      }.should raise_error(SyntaxError, /unexpected|expected a label as the key in the hash pattern/)
     end
 
     it "does not support string interpolation in keys" do
@@ -1016,7 +1012,7 @@ def obj.deconstruct; [1] end
           in {"#{x}": 1}
           end
         RUBY
-      }.should raise_error(SyntaxError, /symbol literal with interpolation is not allowed/)
+      }.should raise_error(SyntaxError, /symbol literal with interpolation is not allowed|expected a label as the key in the hash pattern/)
     end
 
     it "raise SyntaxError when keys duplicate in pattern" do
diff --git a/spec/tags/language/pattern_matching_tags.txt b/spec/tags/language/pattern_matching_tags.txt
index e4f5f38e4cbc..e1b3969f50df 100644
--- a/spec/tags/language/pattern_matching_tags.txt
+++ b/spec/tags/language/pattern_matching_tags.txt
@@ -1,48 +1,10 @@
-fails:Pattern matching variable pattern supports using any name with _ at the beginning in a pattern several times
-fails:Pattern matching alternative pattern matches if any of patterns matches
 fails:Pattern matching alternative pattern does not support variable binding
-fails:Pattern matching alternative pattern support underscore prefixed variables in alternation
-fails:Pattern matching AS pattern binds a variable to a value if pattern matches
-fails:Pattern matching AS pattern can be used as a nested pattern
-fails:Pattern matching Hash pattern supports form id: pat, id: pat, ...
-fails:Pattern matching Hash pattern supports a: which means a: a
-fails:Pattern matching Hash pattern can mix key (a:) and key-value (a: b) declarations
-fails:Pattern matching Hash pattern does not match object if Constant === object returns false
-fails:Pattern matching Hash pattern does not match object without #deconstruct_keys method
-fails:Pattern matching Hash pattern does not match object if #deconstruct_keys method does not return Hash
-fails:Pattern matching Hash pattern does not match object if #deconstruct_keys method returns Hash with non-symbol keys
-fails:Pattern matching Hash pattern does not match object if elements of Hash returned by #deconstruct_keys method does not match values in pattern
-fails:Pattern matching Hash pattern passes keys specified in pattern as arguments to #deconstruct_keys method
-fails:Pattern matching Hash pattern passes keys specified in pattern to #deconstruct_keys method if pattern contains double splat operator **
-fails:Pattern matching Hash pattern passes nil to #deconstruct_keys method if pattern contains double splat operator **rest
-fails:Pattern matching Hash pattern binds variables
-fails:Pattern matching Hash pattern supports double splat operator **rest
-fails:Pattern matching Hash pattern treats **nil like there should not be any other keys in a matched Hash
-fails:Pattern matching Hash pattern matches anything with **
-fails:Pattern matching refinements are used for #deconstruct_keys
-fails:Pattern matching Array pattern accepts a subclass of Array from #deconstruct
 fails:Pattern matching Array pattern calls #deconstruct once for multiple patterns, caching the result
 fails:Pattern matching find pattern captures both preceding and following elements to the pattern
 fails:Pattern matching warning when one-line form warns about pattern matching is experimental feature
-fails:Pattern matching alternative pattern can be used as a nested pattern
-fails:Pattern matching Array pattern can be used as a nested pattern
-fails:Pattern matching Hash pattern can be used as a nested pattern
 fails:Pattern matching find pattern can be nested
 fails:Pattern matching find pattern can be nested with an array pattern
 fails:Pattern matching find pattern can be nested within a hash pattern
 fails:Pattern matching find pattern can nest hash and array patterns
-fails:Pattern matching can omit parentheses in one line pattern matching
-fails:Pattern matching Hash pattern supports form Constant(id: pat, id: pat, ...)
-fails:Pattern matching Hash pattern supports form Constant[id: pat, id: pat, ...]
-fails:Pattern matching Hash pattern supports form {id: pat, id: pat, ...}
-fails:Pattern matching Hash pattern supports 'string': key literal
-fails:Pattern matching Hash pattern matches an object with #deconstruct_keys method which returns a Hash with equal keys and each value in Hash matches value in pattern
-fails:Pattern matching Hash pattern calls #deconstruct_keys per pattern
-fails:Pattern matching Hash pattern can match partially
-fails:Pattern matching Hash pattern matches {} with {}
-fails:Pattern matching refinements are used for #deconstruct
 fails:Pattern matching variable pattern does not support using variable name (except _) several times
-fails:Pattern matching Hash pattern does not support non-symbol keys
-fails:Pattern matching Hash pattern does not support string interpolation in keys
 fails:Pattern matching Hash pattern raise SyntaxError when keys duplicate in pattern
-fails:Pattern matching supports pinning expressions in hash pattern
diff --git a/src/main/java/org/truffleruby/core/array/ArrayDeconstructNode.java b/src/main/java/org/truffleruby/core/array/ArrayDeconstructNode.java
new file mode 100644
index 000000000000..9c9941e2badf
--- /dev/null
+++ b/src/main/java/org/truffleruby/core/array/ArrayDeconstructNode.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.core.array;
+
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.InlinedBranchProfile;
+import com.oracle.truffle.api.profiles.InlinedConditionProfile;
+import org.truffleruby.core.cast.BooleanCastNode;
+import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyNode;
+
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.Specialization;
+import org.truffleruby.language.control.RaiseException;
+import org.truffleruby.language.dispatch.DispatchNode;
+
+import static org.truffleruby.language.dispatch.DispatchConfiguration.PUBLIC;
+
+// Implemented in Java because the call to #deconstruct needs to honor refinements
+@NodeChild(value = "valueNode", type = RubyNode.class)
+public abstract class ArrayDeconstructNode extends RubyContextSourceNode {
+
+    abstract RubyNode getValueNode();
+
+    @Specialization
+    Object deconstruct(VirtualFrame frame, Object toMatch,
+            @Cached DispatchNode respondToNode,
+            @Cached BooleanCastNode booleanCastNode,
+            @Cached DispatchNode deconstructNode,
+            @Cached InlinedConditionProfile hasDeconstructProfile,
+            @Cached InlinedBranchProfile errorProfile) {
+        if (hasDeconstructProfile.profile(this, booleanCastNode.execute(this,
+                respondToNode.callWithFrame(PUBLIC, frame, toMatch, "respond_to?", coreSymbols().DECONSTRUCT)))) {
+            Object deconstructed = deconstructNode.callWithFrame(PUBLIC, frame, toMatch, "deconstruct");
+            if (deconstructed instanceof RubyArray) {
+                return deconstructed;
+            } else {
+                errorProfile.enter(this);
+                throw new RaiseException(getContext(),
+                        coreExceptions().typeError("deconstruct must return Array", this));
+            }
+        } else {
+            return nil;
+        }
+    }
+
+    @Override
+    public RubyNode cloneUninitialized() {
+        return ArrayDeconstructNodeGen.create(getValueNode().cloneUninitialized()).copyFlags(this);
+    }
+
+}
diff --git a/src/main/java/org/truffleruby/core/array/ArrayPatternLengthCheckNode.java b/src/main/java/org/truffleruby/core/array/ArrayPatternLengthCheckNode.java
index 1e2a98fc1ab0..e9ca56f5e926 100644
--- a/src/main/java/org/truffleruby/core/array/ArrayPatternLengthCheckNode.java
+++ b/src/main/java/org/truffleruby/core/array/ArrayPatternLengthCheckNode.java
@@ -9,44 +9,43 @@
  */
 package org.truffleruby.core.array;
 
-import com.oracle.truffle.api.profiles.ConditionProfile;
+import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.Specialization;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
 
-import com.oracle.truffle.api.frame.VirtualFrame;
+@NodeChild(value = "valueNode", type = RubyNode.class)
+public abstract class ArrayPatternLengthCheckNode extends RubyContextSourceNode {
 
-public final class ArrayPatternLengthCheckNode extends RubyContextSourceNode {
-
-    @Child RubyNode currentValueToMatch;
     final int patternLength;
     final boolean hasRest;
 
-    final ConditionProfile isArrayProfile = ConditionProfile.create();
-
-    public ArrayPatternLengthCheckNode(int patternLength, RubyNode currentValueToMatch, boolean hasRest) {
-        this.currentValueToMatch = currentValueToMatch;
+    public ArrayPatternLengthCheckNode(int patternLength, boolean hasRest) {
         this.patternLength = patternLength;
         this.hasRest = hasRest;
     }
 
-    @Override
-    public Object execute(VirtualFrame frame) {
-        Object matchArray = currentValueToMatch.execute(frame);
-        if (isArrayProfile.profile(matchArray instanceof RubyArray)) {
-            long size = ((RubyArray) matchArray).getArraySize();
-            if (hasRest) {
-                return patternLength <= size;
-            } else {
-                return patternLength == size;
-            }
+    abstract RubyNode getValueNode();
+
+    @Specialization
+    boolean arrayLengthCheck(RubyArray matchArray) {
+        int size = matchArray.size;
+        if (hasRest) {
+            return patternLength <= size;
         } else {
-            return false;
+            return patternLength == size;
         }
     }
 
+    @Fallback
+    boolean notArray(Object value) {
+        return false;
+    }
+
     @Override
     public RubyNode cloneUninitialized() {
-        return new ArrayPatternLengthCheckNode(patternLength, currentValueToMatch.cloneUninitialized(), hasRest)
+        return ArrayPatternLengthCheckNodeGen.create(patternLength, hasRest, getValueNode().cloneUninitialized())
                 .copyFlags(this);
     }
 }
diff --git a/src/main/java/org/truffleruby/core/array/ArrayStaticLiteralNode.java b/src/main/java/org/truffleruby/core/array/ArrayStaticLiteralNode.java
new file mode 100644
index 000000000000..e9e205a6bb03
--- /dev/null
+++ b/src/main/java/org/truffleruby/core/array/ArrayStaticLiteralNode.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.core.array;
+
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyGuards;
+import org.truffleruby.language.RubyNode;
+
+public final class ArrayStaticLiteralNode extends RubyContextSourceNode {
+
+    @CompilationFinal(dimensions = 1) private final Object[] values;
+
+    public ArrayStaticLiteralNode(Object[] values) {
+        assert allValuesArePrimitiveOrImmutable(values);
+        this.values = values;
+    }
+
+    private static boolean allValuesArePrimitiveOrImmutable(Object[] values) {
+        for (Object value : values) {
+            assert RubyGuards.isPrimitiveOrImmutable(value);
+        }
+        return true;
+    }
+
+    @Override
+    public RubyArray execute(VirtualFrame frame) {
+        // Copying here is the simplest since we need to return a mutable Array.
+        // An alternative would be to use COW via DelegatedArrayStorage.
+        return createArray(ArrayUtils.copy(values));
+    }
+
+    @Override
+    public RubyNode cloneUninitialized() {
+        return new ArrayStaticLiteralNode(values);
+    }
+
+}
diff --git a/src/main/java/org/truffleruby/core/hash/HashDeconstructKeysNode.java b/src/main/java/org/truffleruby/core/hash/HashDeconstructKeysNode.java
new file mode 100644
index 000000000000..ceec5644f619
--- /dev/null
+++ b/src/main/java/org/truffleruby/core/hash/HashDeconstructKeysNode.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.core.hash;
+
+import static org.truffleruby.language.dispatch.DispatchConfiguration.PUBLIC;
+
+import org.truffleruby.core.cast.BooleanCastNode;
+import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyNode;
+import org.truffleruby.language.control.RaiseException;
+import org.truffleruby.language.dispatch.DispatchNode;
+
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.InlinedBranchProfile;
+import com.oracle.truffle.api.profiles.InlinedConditionProfile;
+
+// Implemented in Java because the call to #deconstruct_keys needs to honor refinements
+@NodeChild(value = "valueNode", type = RubyNode.class)
+@NodeChild(value = "keysNode", type = RubyNode.class)
+public abstract class HashDeconstructKeysNode extends RubyContextSourceNode {
+
+    abstract RubyNode getValueNode();
+
+    abstract RubyNode getKeysNode();
+
+    @Specialization
+    Object deconstructKeys(VirtualFrame frame, Object toMatch, Object keys,
+            @Cached DispatchNode respondToNode,
+            @Cached BooleanCastNode booleanCastNode,
+            @Cached DispatchNode deconstructKeysNode,
+            @Cached InlinedConditionProfile hasDeconstructKeysProfile,
+            @Cached InlinedBranchProfile errorProfile) {
+        if (hasDeconstructKeysProfile.profile(this, booleanCastNode.execute(this,
+                respondToNode.callWithFrame(PUBLIC, frame, toMatch, "respond_to?", coreSymbols().DECONSTRUCT_KEYS)))) {
+            Object deconstructed = deconstructKeysNode.callWithFrame(PUBLIC, frame, toMatch, "deconstruct_keys", keys);
+            if (deconstructed instanceof RubyHash) {
+                return deconstructed;
+            } else {
+                errorProfile.enter(this);
+                throw new RaiseException(getContext(),
+                        coreExceptions().typeError("deconstruct_keys must return Hash", this));
+            }
+        } else {
+            return nil;
+        }
+    }
+
+    @Override
+    public RubyNode cloneUninitialized() {
+        return HashDeconstructKeysNodeGen
+                .create(getValueNode().cloneUninitialized(), getKeysNode().cloneUninitialized()).copyFlags(this);
+    }
+
+}
diff --git a/src/main/java/org/truffleruby/core/hash/HashGetOrUndefinedNode.java b/src/main/java/org/truffleruby/core/hash/HashGetOrUndefinedNode.java
new file mode 100644
index 000000000000..e41a2e17afdd
--- /dev/null
+++ b/src/main/java/org/truffleruby/core/hash/HashGetOrUndefinedNode.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.core.hash;
+
+import com.oracle.truffle.api.dsl.ImportStatic;
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.Frame;
+import com.oracle.truffle.api.library.CachedLibrary;
+import org.truffleruby.collections.PEBiFunction;
+import org.truffleruby.core.hash.library.HashStoreLibrary;
+import org.truffleruby.core.symbol.RubySymbol;
+import org.truffleruby.language.NotProvided;
+import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyNode;
+
+/** The same as {@link HashNodes.GetOrUndefinedNode} but with a static key. */
+@ImportStatic(HashGuards.class)
+@NodeChild(value = "hashNode", type = RubyNode.class)
+public abstract class HashGetOrUndefinedNode extends RubyContextSourceNode implements PEBiFunction {
+
+    private final RubySymbol key;
+
+    public HashGetOrUndefinedNode(RubySymbol key) {
+        this.key = key;
+    }
+
+    abstract RubyNode getHashNode();
+
+    @Specialization(limit = "hashStrategyLimit()")
+    Object get(RubyHash hash,
+            @CachedLibrary("hash.store") HashStoreLibrary hashes) {
+        return hashes.lookupOrDefault(hash.store, null, hash, key, this);
+    }
+
+    @Override
+    public Object accept(Frame frame, Object hash, Object key) {
+        return NotProvided.INSTANCE;
+    }
+
+    @Override
+    public RubyNode cloneUninitialized() {
+        var copy = HashGetOrUndefinedNodeGen.create(key, getHashNode().cloneUninitialized());
+        return copy.copyFlags(this);
+    }
+
+}
diff --git a/src/main/java/org/truffleruby/core/hash/HashIsEmptyNode.java b/src/main/java/org/truffleruby/core/hash/HashIsEmptyNode.java
new file mode 100644
index 000000000000..5289b771548d
--- /dev/null
+++ b/src/main/java/org/truffleruby/core/hash/HashIsEmptyNode.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.core.hash;
+
+import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyNode;
+
+import com.oracle.truffle.api.frame.VirtualFrame;
+
+public final class HashIsEmptyNode extends RubyContextSourceNode {
+
+    @Child RubyNode currentValueToMatch;
+
+    public HashIsEmptyNode(RubyNode currentValueToMatch) {
+        this.currentValueToMatch = currentValueToMatch;
+    }
+
+    @Override
+    public Object execute(VirtualFrame frame) {
+        RubyHash matchHash = (RubyHash) currentValueToMatch.execute(frame);
+        return matchHash.empty();
+    }
+
+    @Override
+    public RubyNode cloneUninitialized() {
+        return new HashIsEmptyNode(currentValueToMatch.cloneUninitialized()).copyFlags(this);
+    }
+}
diff --git a/src/main/java/org/truffleruby/core/hash/HashPatternLengthCheckNode.java b/src/main/java/org/truffleruby/core/hash/HashPatternLengthCheckNode.java
new file mode 100644
index 000000000000..b9fe741e47be
--- /dev/null
+++ b/src/main/java/org/truffleruby/core/hash/HashPatternLengthCheckNode.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.core.hash;
+
+import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.Specialization;
+import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyNode;
+
+@NodeChild(value = "valueNode", type = RubyNode.class)
+public abstract class HashPatternLengthCheckNode extends RubyContextSourceNode {
+
+    private final int minimumKeys;
+
+    public HashPatternLengthCheckNode(int minimumKeys) {
+        this.minimumKeys = minimumKeys;
+    }
+
+    abstract RubyNode getValueNode();
+
+    @Specialization
+    boolean hashLengthCheck(RubyHash matchHash) {
+        return minimumKeys <= matchHash.size;
+    }
+
+    @Fallback
+    boolean notHash(Object value) {
+        return false;
+    }
+
+    @Override
+    public RubyNode cloneUninitialized() {
+        return HashPatternLengthCheckNodeGen.create(minimumKeys, getValueNode().cloneUninitialized()).copyFlags(this);
+    }
+}
diff --git a/src/main/java/org/truffleruby/core/hash/HashSubtractKeysNode.java b/src/main/java/org/truffleruby/core/hash/HashSubtractKeysNode.java
new file mode 100644
index 000000000000..f853e2dc7d47
--- /dev/null
+++ b/src/main/java/org/truffleruby/core/hash/HashSubtractKeysNode.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.core.hash;
+
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.Specialization;
+import org.truffleruby.core.hash.library.HashStoreLibrary;
+import org.truffleruby.core.hash.library.HashStoreLibrary.EachEntryCallback;
+import org.truffleruby.core.symbol.RubySymbol;
+import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyNode;
+
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.nodes.ExplodeLoop;
+
+/** Based on {@link org.truffleruby.language.arguments.ReadKeywordRestArgumentNode} */
+@NodeChild(value = "hashNode", type = RubyNode.class)
+public abstract class HashSubtractKeysNode extends RubyContextSourceNode implements EachEntryCallback {
+
+    @CompilationFinal(dimensions = 1) private final RubySymbol[] excludedKeys;
+
+    @Child private HashStoreLibrary hashes = HashStoreLibrary.createDispatched();
+
+    public HashSubtractKeysNode(RubySymbol[] excludedKeys) {
+        this.excludedKeys = excludedKeys;
+    }
+
+    abstract RubyNode getHashNode();
+
+    @Specialization
+    RubyHash remainingKeys(RubyHash hash) {
+        RubyHash rest = HashOperations.newEmptyHash(getContext(), getLanguage());
+        hashes.eachEntry(hash.store, hash, this, rest);
+        return rest;
+    }
+
+    @Override
+    public void accept(int index, Object key, Object value, Object state) {
+        if (!keyExcluded(key)) {
+            RubyHash rest = (RubyHash) state;
+            hashes.set(rest.store, rest, key, value, false);
+        }
+    }
+
+    @ExplodeLoop
+    private boolean keyExcluded(Object key) {
+        for (RubySymbol excludedKey : excludedKeys) {
+            if (excludedKey == key) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public RubyNode cloneUninitialized() {
+        return HashSubtractKeysNodeGen.create(excludedKeys, getHashNode().cloneUninitialized()).copyFlags(this);
+    }
+
+}
diff --git a/src/main/java/org/truffleruby/core/kernel/KernelNodes.java b/src/main/java/org/truffleruby/core/kernel/KernelNodes.java
index cbc0682bee2b..b1da3d150421 100644
--- a/src/main/java/org/truffleruby/core/kernel/KernelNodes.java
+++ b/src/main/java/org/truffleruby/core/kernel/KernelNodes.java
@@ -1389,7 +1389,7 @@ Object send(Frame callerFrame, Object self, Object[] rubyArgs, RootCallTarget ta
     @CoreMethod(names = "respond_to?", required = 1, optional = 1, alwaysInlined = true)
     public abstract static class RespondToNode extends AlwaysInlinedMethodNode {
 
-        public final boolean executeDoesRespondTo(Object self, Object name, boolean includeProtectedAndPrivate) {
+        public final boolean executeDoesRespondTo(Object self, RubySymbol name, boolean includeProtectedAndPrivate) {
             final Object[] rubyArgs = RubyArguments.allocate(2);
             RubyArguments.setArgument(rubyArgs, 0, name);
             RubyArguments.setArgument(rubyArgs, 1, includeProtectedAndPrivate);
diff --git a/src/main/java/org/truffleruby/core/support/IsNotUndefinedNode.java b/src/main/java/org/truffleruby/core/support/IsNotUndefinedNode.java
new file mode 100644
index 000000000000..1712f1857232
--- /dev/null
+++ b/src/main/java/org/truffleruby/core/support/IsNotUndefinedNode.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.core.support;
+
+import com.oracle.truffle.api.frame.VirtualFrame;
+import org.truffleruby.language.NotProvided;
+import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyNode;
+
+import com.oracle.truffle.api.dsl.NodeChild;
+
+@NodeChild(value = "valueNode", type = RubyNode.class)
+public final class IsNotUndefinedNode extends RubyContextSourceNode {
+
+    @Child RubyNode valueNode;
+
+    public IsNotUndefinedNode(RubyNode valueNode) {
+        this.valueNode = valueNode;
+    }
+
+    @Override
+    public Object execute(VirtualFrame frame) {
+        Object value = valueNode.execute(frame);
+        return value != NotProvided.INSTANCE;
+    }
+
+    @Override
+    public RubyNode cloneUninitialized() {
+        var copy = new IsNotUndefinedNode(valueNode.cloneUninitialized());
+        return copy.copyFlags(this);
+    }
+
+}
diff --git a/src/main/java/org/truffleruby/core/support/TypeNodes.java b/src/main/java/org/truffleruby/core/support/TypeNodes.java
index d57e7ebbbcda..c11574492db6 100644
--- a/src/main/java/org/truffleruby/core/support/TypeNodes.java
+++ b/src/main/java/org/truffleruby/core/support/TypeNodes.java
@@ -77,7 +77,7 @@ boolean isA(Object object, RubyModule module,
     @Primitive(name = "respond_to?")
     public abstract static class RespondToPrimitiveNode extends PrimitiveArrayArgumentsNode {
         @Specialization
-        boolean respondTo(Object object, Object name, boolean includePrivate,
+        boolean respondTo(Object object, RubySymbol name, boolean includePrivate,
                 @Cached KernelNodes.RespondToNode respondToNode) {
             // Do not pass a frame here, we want to ignore refinements and not need to read the caller frame
             return respondToNode.executeDoesRespondTo(object, name, includePrivate);
diff --git a/src/main/java/org/truffleruby/core/symbol/CoreSymbols.java b/src/main/java/org/truffleruby/core/symbol/CoreSymbols.java
index 9a4b7a7ed17f..038356150487 100644
--- a/src/main/java/org/truffleruby/core/symbol/CoreSymbols.java
+++ b/src/main/java/org/truffleruby/core/symbol/CoreSymbols.java
@@ -44,6 +44,8 @@ public final class CoreSymbols {
     public final RubySymbol BIG = createRubySymbol("big");
     public final RubySymbol LITTLE = createRubySymbol("little");
     public final RubySymbol NATIVE = createRubySymbol("native");
+    public final RubySymbol DECONSTRUCT = createRubySymbol("deconstruct");
+    public final RubySymbol DECONSTRUCT_KEYS = createRubySymbol("deconstruct_keys");
 
     // Added to workaround liquid's no symbols leaked test (SecurityTest#test_does_not_permanently_add_filters_to_symbol_table)
     public final RubySymbol IMMEDIATE_SWEEP = createRubySymbol("immediate_sweep");
diff --git a/src/main/java/org/truffleruby/language/dispatch/DispatchNode.java b/src/main/java/org/truffleruby/language/dispatch/DispatchNode.java
index bb542997a817..f524c2d97ee2 100644
--- a/src/main/java/org/truffleruby/language/dispatch/DispatchNode.java
+++ b/src/main/java/org/truffleruby/language/dispatch/DispatchNode.java
@@ -206,11 +206,15 @@ public Object callWithDescriptor(Object receiver, String method, Object block,
     }
 
     public Object callWithFrame(Frame frame, Object receiver, String method) {
+        return callWithFrame(PRIVATE, frame, receiver, method);
+    }
+
+    public Object callWithFrame(DispatchConfiguration config, Frame frame, Object receiver, String method) {
         final Object[] rubyArgs = RubyArguments.allocate(0);
         RubyArguments.setSelf(rubyArgs, receiver);
         RubyArguments.setBlock(rubyArgs, nil);
         RubyArguments.setDescriptor(rubyArgs, NoKeywordArgumentsDescriptor.INSTANCE);
-        return execute(frame, receiver, method, rubyArgs, PRIVATE);
+        return execute(frame, receiver, method, rubyArgs, config);
     }
 
     public Object callWithFrame(DispatchConfiguration config, Frame frame, Object receiver, String method,
diff --git a/src/main/java/org/truffleruby/parser/PatternMatchingTranslator.java b/src/main/java/org/truffleruby/parser/PatternMatchingTranslator.java
index ea357ef38e59..f0a67ee11a48 100644
--- a/src/main/java/org/truffleruby/parser/PatternMatchingTranslator.java
+++ b/src/main/java/org/truffleruby/parser/PatternMatchingTranslator.java
@@ -11,9 +11,10 @@
 
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
+import org.truffleruby.core.array.ArrayDeconstructNodeGen;
 import org.truffleruby.core.array.ArrayIndexNodes;
 import org.truffleruby.core.array.ArrayLiteralNode;
-import org.truffleruby.core.array.ArrayPatternLengthCheckNode;
+import org.truffleruby.core.array.ArrayPatternLengthCheckNodeGen;
 import org.truffleruby.core.array.ArraySliceNodeGen;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.SourceIndexLength;
@@ -123,8 +124,7 @@ public RubyNode visitArrayPatternNode(ArrayPatternParseNode arrayPatternParseNod
         var postNodes = arrayPatternParseNode.getPostArgs();
         var restNode = arrayPatternParseNode.getRestArg();
 
-        var deconstructed = createCallNode(new TruffleInternalModuleLiteralNode(), "deconstruct_checked",
-                currentValueToMatch);
+        var deconstructed = ArrayDeconstructNodeGen.create(currentValueToMatch);
 
         final int deconstructedSlot = environment.declareLocalTemp("p_decon_array");
         final ReadLocalNode readTemp = environment.readNode(deconstructedSlot, sourceSection);
@@ -133,8 +133,8 @@ public RubyNode visitArrayPatternNode(ArrayPatternParseNode arrayPatternParseNod
 
         int preSize = arrayPatternParseNode.preArgsNum();
 
-        RubyNode condition = new ArrayPatternLengthCheckNode(arrayPatternParseNode.minimumArgsNum(),
-                currentValueToMatch, arrayPatternParseNode.hasRestArg());
+        RubyNode condition = ArrayPatternLengthCheckNodeGen.create(arrayPatternParseNode.minimumArgsNum(),
+                arrayPatternParseNode.hasRestArg(), currentValueToMatch);
 
         // Constant === pattern.deconstruct
         if (arrayPatternParseNode.hasConstant()) {
diff --git a/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
index da98784e93a2..58600876cd05 100644
--- a/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
@@ -11,6 +11,7 @@
 
 import java.util.List;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import org.prism.AbstractNodeVisitor;
 import org.prism.Nodes;
 import org.truffleruby.RubyLanguage;
@@ -20,7 +21,6 @@
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.arguments.NoKeywordArgumentsDescriptor;
-import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.control.SequenceNode;
 import org.truffleruby.language.dispatch.RubyCallNodeParameters;
 import org.truffleruby.language.literal.NilLiteralNode;
@@ -64,16 +64,20 @@ public final TranslatorEnvironment getEnvironment() {
         return environment;
     }
 
-    @Override
-    protected RubyNode defaultVisit(Nodes.Node node) {
+    protected RuntimeException fail(Nodes.Node node) {
         var context = RubyLanguage.getCurrentContext();
         String code = toString(node);
         var message = this.getClass().getSimpleName() + " does not know how to translate " +
                 node.getClass().getSimpleName() + " at " + context.fileLine(getSourceSection(node)) +
                 "\nCode snippet:\n" + code + "\nPrism AST:\n" + node;
-        throw new RaiseException(context,
-                context.getCoreExceptions().syntaxError(message, null, getSourceSection(node)));
-        // throw new Error(message);
+        // throw new RaiseException(context,
+        //         context.getCoreExceptions().syntaxError(message, null, getSourceSection(node)));
+        throw CompilerDirectives.shouldNotReachHere(message);
+    }
+
+    @Override
+    protected RubyNode defaultVisit(Nodes.Node node) {
+        throw fail(node);
     }
 
     protected static RubyNode[] createArray(int size) {
diff --git a/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
index 8947445e3264..5c3a09914fb4 100644
--- a/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
@@ -11,21 +11,29 @@
 
 import java.util.Arrays;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import org.prism.Nodes;
 import org.truffleruby.RubyLanguage;
+import org.truffleruby.core.array.ArrayDeconstructNodeGen;
 import org.truffleruby.core.array.ArrayIndexNodes;
-import org.truffleruby.core.array.ArrayPatternLengthCheckNode;
+import org.truffleruby.core.array.ArrayPatternLengthCheckNodeGen;
 import org.truffleruby.core.array.ArraySliceNodeGen;
+import org.truffleruby.core.array.ArrayStaticLiteralNode;
+import org.truffleruby.core.hash.HashDeconstructKeysNodeGen;
+import org.truffleruby.core.hash.HashGetOrUndefinedNodeGen;
+import org.truffleruby.core.hash.HashIsEmptyNode;
+import org.truffleruby.core.hash.HashPatternLengthCheckNodeGen;
+import org.truffleruby.core.hash.HashSubtractKeysNodeGen;
+import org.truffleruby.core.support.IsNotUndefinedNode;
+import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.control.AndNodeGen;
 import org.truffleruby.language.control.ExecuteAndReturnTrueNode;
 import org.truffleruby.language.control.NotNodeGen;
-import org.truffleruby.language.literal.TruffleInternalModuleLiteralNode;
+import org.truffleruby.language.control.OrNodeGen;
+import org.truffleruby.language.literal.NilLiteralNode;
 import org.truffleruby.language.locals.ReadLocalNode;
 import org.truffleruby.language.locals.WriteLocalNode;
 
-
 /** Translate the pattern of pattern matching. Executing the translated node must result in true or false. Every visit
  * method here should return a node which is the condition of whether it matched. Visit methods can change & restore
  * {@code currentValueToMatch} to change which expression is being matched against. */
@@ -45,8 +53,13 @@ public YARPPatternMatchingTranslator(
     }
 
     public RubyNode translatePatternNode(Nodes.Node patternNode, RubyNode expressionValue) {
+        RubyNode prev = currentValueToMatch;
         currentValueToMatch = expressionValue;
-        return patternNode.accept(this);
+        try {
+            return patternNode.accept(this);
+        } finally {
+            currentValueToMatch = prev;
+        }
     }
 
     @Override
@@ -65,6 +78,20 @@ public RubyNode visitUnlessNode(Nodes.UnlessNode node) { // a guard like `in [a]
         return AndNodeGen.create(pattern, condition);
     }
 
+    @Override
+    public RubyNode visitAlternationPatternNode(Nodes.AlternationPatternNode node) {
+        var orNode = OrNodeGen.create(node.left.accept(this), node.right.accept(this));
+        return assignPositionAndFlags(node, orNode);
+    }
+
+    @Override
+    public RubyNode visitCapturePatternNode(Nodes.CapturePatternNode node) {
+        RubyNode condition = AndNodeGen.create(
+                node.value.accept(this),
+                new ExecuteAndReturnTrueNode(node.target.accept(this)));
+        return assignPositionAndFlags(node, condition);
+    }
+
     @Override
     public RubyNode visitArrayPatternNode(Nodes.ArrayPatternNode node) {
         var preNodes = node.requireds;
@@ -74,80 +101,166 @@ public RubyNode visitArrayPatternNode(Nodes.ArrayPatternNode node) {
         int preSize = preNodes.length;
         int postSize = postNodes.length;
 
-        var deconstructed = createCallNode(new TruffleInternalModuleLiteralNode(), "deconstruct_checked",
-                currentValueToMatch);
+        var deconstructed = ArrayDeconstructNodeGen.create(currentValueToMatch);
 
         final int deconstructedSlot = environment.declareLocalTemp("pattern_deconstruct_array");
         final ReadLocalNode readTemp = environment.readNode(deconstructedSlot, node);
         final RubyNode assignTemp = readTemp.makeWriteNode(deconstructed);
-        currentValueToMatch = readTemp;
 
-        RubyNode condition = new ArrayPatternLengthCheckNode(preSize + postSize,
-                currentValueToMatch, restNode != null);
+        RubyNode outerPrev = currentValueToMatch;
+        currentValueToMatch = readTemp;
+        try {
+            RubyNode condition = ArrayPatternLengthCheckNodeGen.create(preSize + postSize, restNode != null, readTemp);
 
-        if (node.constant != null) { // Constant[a]
-            condition = AndNodeGen.create(matchValue(node.constant), condition);
-        }
+            if (node.constant != null) { // Constant[a]
+                condition = AndNodeGen.create(matchValue(node.constant), condition);
+            }
 
-        for (int i = 0; i < preNodes.length; i++) {
-            var preNode = preNodes[i];
+            for (int i = 0; i < preNodes.length; i++) {
+                var preNode = preNodes[i];
 
-            RubyNode prev = currentValueToMatch;
-            currentValueToMatch = ArrayIndexNodes.ReadConstantIndexNode.create(currentValueToMatch, i);
-            try {
-                condition = AndNodeGen.create(condition, preNode.accept(this));
-            } finally {
-                currentValueToMatch = prev;
+                RubyNode prev = currentValueToMatch;
+                currentValueToMatch = ArrayIndexNodes.ReadConstantIndexNode.create(readTemp, i);
+                try {
+                    condition = AndNodeGen.create(condition, preNode.accept(this));
+                } finally {
+                    currentValueToMatch = prev;
+                }
             }
-        }
 
-        if (restNode != null) {
-            if (restNode instanceof Nodes.SplatNode splatNode) {
-                if (splatNode.expression != null) {
-                    RubyNode prev = currentValueToMatch;
-                    currentValueToMatch = ArraySliceNodeGen.create(preSize, -postSize, currentValueToMatch);
-                    try {
-                        condition = AndNodeGen.create(condition, splatNode.expression.accept(this));
-                    } finally {
-                        currentValueToMatch = prev;
+            if (restNode != null) {
+                if (restNode instanceof Nodes.SplatNode splatNode) {
+                    if (splatNode.expression != null) {
+                        RubyNode prev = currentValueToMatch;
+                        currentValueToMatch = ArraySliceNodeGen.create(preSize, -postSize, readTemp);
+                        try {
+                            condition = AndNodeGen.create(condition, splatNode.expression.accept(this));
+                        } finally {
+                            currentValueToMatch = prev;
+                        }
+                    } else { // in [1, *, 2]
+                        // Nothing
                     }
-                } else { // in [1, *, 2]
+                } else if (restNode instanceof Nodes.ImplicitRestNode) { // in [0, 1,]
                     // Nothing
+                } else {
+                    throw fail(node);
                 }
-            } else if (restNode instanceof Nodes.ImplicitRestNode) { // in [0, 1,]
-                // Nothing
-            } else {
-                throw CompilerDirectives.shouldNotReachHere(node.getClass().getName());
             }
-        }
 
-        for (int i = 0; i < postNodes.length; i++) {
-            var postNode = postNodes[i];
-            int index = -postNodes.length + i;
-            RubyNode prev = currentValueToMatch;
-            currentValueToMatch = ArrayIndexNodes.ReadConstantIndexNode.create(currentValueToMatch, index);
-            try {
-                condition = AndNodeGen.create(condition, postNode.accept(this));
-            } finally {
-                currentValueToMatch = prev;
+            for (int i = 0; i < postNodes.length; i++) {
+                var postNode = postNodes[i];
+                int index = -postNodes.length + i;
+                RubyNode prev = currentValueToMatch;
+                currentValueToMatch = ArrayIndexNodes.ReadConstantIndexNode.create(readTemp, index);
+                try {
+                    condition = AndNodeGen.create(condition, postNode.accept(this));
+                } finally {
+                    currentValueToMatch = prev;
+                }
             }
-        }
 
-        return YARPTranslator.sequence(node, Arrays.asList(assignTemp, condition));
+            RubyNode ret = YARPTranslator.sequence(Arrays.asList(assignTemp, condition));
+            return assignPositionAndFlags(node, ret);
+        } finally {
+            currentValueToMatch = outerPrev;
+        }
     }
 
     @Override
     public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
-        // var deconstructed = createCallNode(currentValueToMatch, "deconstruct_keys", new NilLiteralNode());
+        Nodes.Node[] pairs = node.elements;
+        RubySymbol[] keys = new RubySymbol[pairs.length];
+        for (int i = 0; i < pairs.length; i++) {
+            Nodes.AssocNode assocNode = (Nodes.AssocNode) pairs[i];
+            Nodes.Node keyNode = assocNode.key;
+
+            final RubySymbol key;
+            if (keyNode instanceof Nodes.SymbolNode symbolNode) {
+                key = yarpTranslator.translateSymbol(symbolNode);
+            } else {
+                throw fail(node);
+            }
+            keys[i] = key;
+        }
 
-        // Not correct, the pattern cannot always be represented as a runtime value and this overflows the stack:
-        //        return createCallNode(
-        //                new TruffleInternalModuleLiteralNode(),
-        //                "hash_pattern_matches?",
-        //                node.accept(this),
-        //                NodeUtil.cloneNode(deconstructed));
+        final RubyNode keysForDeconstructKeys;
+        if (node.rest == null || node.rest instanceof Nodes.AssocSplatNode splatNode && splatNode.value == null) {
+            keysForDeconstructKeys = new ArrayStaticLiteralNode(keys);
+        } else {
+            keysForDeconstructKeys = new NilLiteralNode();
+        }
 
-        return defaultVisit(node);
+        var deconstructed = HashDeconstructKeysNodeGen.create(currentValueToMatch, keysForDeconstructKeys);
+
+        final int deconstructedSlot = environment.declareLocalTemp("pattern_deconstruct_hash");
+        final ReadLocalNode readTemp = environment.readNode(deconstructedSlot, node);
+        final RubyNode assignTemp = readTemp.makeWriteNode(deconstructed);
+
+        RubyNode outerPrev = currentValueToMatch;
+        currentValueToMatch = readTemp;
+        try {
+
+            RubyNode condition = HashPatternLengthCheckNodeGen.create(node.elements.length, readTemp);
+
+            if (node.constant != null) { // Constant[a: 0]
+                condition = AndNodeGen.create(matchValue(node.constant), condition);
+            }
+
+            for (int i = 0; i < pairs.length; i++) {
+                Nodes.AssocNode assocNode = (Nodes.AssocNode) pairs[i];
+                RubySymbol key = keys[i];
+
+                RubyNode valueOrUndefined = HashGetOrUndefinedNodeGen.create(key, readTemp);
+
+                final int valueSlot = environment.declareLocalTemp("pattern_hash_value");
+                final ReadLocalNode readValue = environment.readNode(valueSlot, assocNode);
+                final RubyNode writeValue = readValue.makeWriteNode(valueOrUndefined);
+
+                RubyNode prev = currentValueToMatch;
+                currentValueToMatch = readValue;
+                try {
+                    RubyNode check = YARPTranslator.sequence(assocNode, Arrays.asList(
+                            writeValue,
+                            AndNodeGen.create(new IsNotUndefinedNode(readValue), assocNode.value.accept(this))));
+                    condition = AndNodeGen.create(condition, check);
+                } finally {
+                    currentValueToMatch = prev;
+                }
+            }
+
+            var rest = node.rest;
+            if (rest != null) {
+                if (rest instanceof Nodes.AssocSplatNode assocSplatNode) {
+                    if (assocSplatNode.value != null) {
+                        RubyNode prev = currentValueToMatch;
+                        currentValueToMatch = HashSubtractKeysNodeGen.create(keys, readTemp);
+                        try {
+                            condition = AndNodeGen.create(condition, assocSplatNode.value.accept(this));
+                        } finally {
+                            currentValueToMatch = prev;
+                        }
+                    } else {
+                        // nothing
+                    }
+                } else if (rest instanceof Nodes.NoKeywordsParameterNode) {
+                    condition = AndNodeGen.create(condition,
+                            new HashIsEmptyNode(HashSubtractKeysNodeGen.create(keys, readTemp)));
+                } else {
+                    throw fail(rest);
+                }
+            }
+
+            RubyNode ret = YARPTranslator.sequence(Arrays.asList(assignTemp, condition));
+            return assignPositionAndFlags(node, ret);
+        } finally {
+            currentValueToMatch = outerPrev;
+        }
+    }
+
+    @Override
+    public RubyNode visitImplicitNode(Nodes.ImplicitNode node) {
+        return node.value.accept(this);
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index 64fac6025caf..638b082f9f60 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -3135,6 +3135,13 @@ private RubyNode executeOrInheritBlock(RubyNode blockNode) {
 
     @Override
     public RubyNode visitSymbolNode(Nodes.SymbolNode node) {
+        final var symbol = translateSymbol(node);
+
+        final RubyNode rubyNode = new ObjectLiteralNode(symbol);
+        return assignPositionAndFlags(node, rubyNode);
+    }
+
+    public RubySymbol translateSymbol(Nodes.SymbolNode node) {
         final RubyEncoding encoding;
 
         if (node.isForcedUtf8Encoding()) {
@@ -3148,10 +3155,7 @@ public RubyNode visitSymbolNode(Nodes.SymbolNode node) {
         }
 
         var tstring = TStringUtils.fromByteArray(node.unescaped, encoding);
-        final RubySymbol symbol = language.getSymbol(tstring, encoding);
-
-        final RubyNode rubyNode = new ObjectLiteralNode(symbol);
-        return assignPositionAndFlags(node, rubyNode);
+        return language.getSymbol(tstring, encoding);
     }
 
     @Override
diff --git a/src/main/ruby/truffleruby/core/truffle/internal.rb b/src/main/ruby/truffleruby/core/truffle/internal.rb
index c82556986177..857e6b263ba7 100644
--- a/src/main/ruby/truffleruby/core/truffle/internal.rb
+++ b/src/main/ruby/truffleruby/core/truffle/internal.rb
@@ -56,23 +56,4 @@ def self.when_splat(cases, expression)
       c === expression
     end
   end
-
-  def self.deconstruct_checked(pattern)
-    if pattern.respond_to? :deconstruct
-      deconstructed = pattern.deconstruct
-      if Primitive.is_a?(deconstructed, Array)
-        deconstructed
-      else
-        raise TypeError,'deconstruct must return Array'
-      end
-    else
-      nil
-    end
-  end
-
-  def self.hash_pattern_matches?(pattern, expression)
-    pattern.all? do |key, value|
-      expression.has_key?(key) && value === expression.fetch(key)
-    end
-  end
 end
diff --git a/tool/generate-core-symbols.rb b/tool/generate-core-symbols.rb
index d4eea36f89c1..9f165aa15440 100755
--- a/tool/generate-core-symbols.rb
+++ b/tool/generate-core-symbols.rb
@@ -63,6 +63,8 @@
     public final RubySymbol BIG = createRubySymbol("big");
     public final RubySymbol LITTLE = createRubySymbol("little");
     public final RubySymbol NATIVE = createRubySymbol("native");
+    public final RubySymbol DECONSTRUCT = createRubySymbol("deconstruct");
+    public final RubySymbol DECONSTRUCT_KEYS = createRubySymbol("deconstruct_keys");
 
     // Added to workaround liquid's no symbols leaked test (SecurityTest#test_does_not_permanently_add_filters_to_symbol_table)
     public final RubySymbol IMMEDIATE_SWEEP = createRubySymbol("immediate_sweep");

From f3cad5ffba6c09adf2fb0d32fe936367ef64acad Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 13:55:46 +0100
Subject: [PATCH 097/131] Raise a SyntaxError if the translator does not know
 how to deal with a node

* So it can still be caught in user code, e.g. for missing find pattern matching.
---
 .../org/truffleruby/debug/TruffleDebugNodes.java     | 12 +-----------
 .../org/truffleruby/parser/YARPBaseTranslator.java   |  8 ++++----
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java
index b31c8ea8c923..e029e351b678 100644
--- a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java
+++ b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java
@@ -76,7 +76,6 @@
 import org.truffleruby.language.arguments.NoKeywordArgumentsDescriptor;
 import org.truffleruby.language.arguments.RubyArguments;
 import org.truffleruby.language.backtrace.BacktraceFormatter;
-import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.library.RubyStringLibrary;
 import org.truffleruby.language.loader.ByteBasedCharSequence;
 import org.truffleruby.language.methods.DeclarationContext;
@@ -1461,16 +1460,7 @@ Object parseAndDump(Object code, Object focusedNodeClassName, int index, boolean
                 @Cached RubyStringLibrary strings,
                 @Cached TruffleString.FromJavaStringNode fromJavaStringNode) {
             String nodeClassNameString = RubyGuards.getJavaString(focusedNodeClassName);
-            RubyRootNode rootNode;
-            try {
-                rootNode = parse(code, mainScript);
-            } catch (Error e) {
-                if (e.getMessage() != null && e.getMessage().contains("does not know how to translate")) {
-                    throw new RaiseException(getContext(), coreExceptions().runtimeError(e.getMessage(), this));
-                } else {
-                    throw e;
-                }
-            }
+            RubyRootNode rootNode = parse(code, mainScript);
             String output = TruffleASTPrinter.dump(rootNode, nodeClassNameString, index);
             return createString(fromJavaStringNode, output, Encodings.UTF_8);
         }
diff --git a/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
index 58600876cd05..8bdc29723c4d 100644
--- a/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
@@ -11,7 +11,6 @@
 
 import java.util.List;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import org.prism.AbstractNodeVisitor;
 import org.prism.Nodes;
 import org.truffleruby.RubyLanguage;
@@ -21,6 +20,7 @@
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.arguments.NoKeywordArgumentsDescriptor;
+import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.control.SequenceNode;
 import org.truffleruby.language.dispatch.RubyCallNodeParameters;
 import org.truffleruby.language.literal.NilLiteralNode;
@@ -70,9 +70,9 @@ protected RuntimeException fail(Nodes.Node node) {
         var message = this.getClass().getSimpleName() + " does not know how to translate " +
                 node.getClass().getSimpleName() + " at " + context.fileLine(getSourceSection(node)) +
                 "\nCode snippet:\n" + code + "\nPrism AST:\n" + node;
-        // throw new RaiseException(context,
-        //         context.getCoreExceptions().syntaxError(message, null, getSourceSection(node)));
-        throw CompilerDirectives.shouldNotReachHere(message);
+        throw new RaiseException(context,
+                context.getCoreExceptions().syntaxError(message, null, getSourceSection(node)));
+        // throw CompilerDirectives.shouldNotReachHere(message); // Useful for debugging
     }
 
     @Override

From 4ca8e3feac07d40d0612886f1097d638cb7f067f Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 13:53:41 +0100
Subject: [PATCH 098/131] Enable pattern matching by default and remove the
 option

---
 CHANGELOG.md                                         |  1 +
 src/main/java/org/truffleruby/options/Options.java   |  5 -----
 .../java/org/truffleruby/parser/BodyTranslator.java  | 10 ----------
 .../java/org/truffleruby/parser/YARPTranslator.java  | 12 ------------
 src/options.yml                                      |  1 -
 .../truffleruby/shared/options/OptionsCatalog.java   | 12 ------------
 tool/docker.rb                                       |  1 -
 tool/jt.rb                                           |  2 --
 8 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1466f9bda843..973ac7b65067 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 New features:
 
 * C/C++ extensions are now compiled using the system toolchain and executed natively instead of using GraalVM LLVM (Sulong). This leads to faster startup, no warmup, better compatibility, smaller distribution and faster installation for C/C++ extensions (#3118, @eregon).
+* Pattern matching is now fully supported, with the exception of Find pattern (`in [*, a, *]`) (#3332, #2683, @eregon, @razetime).
 
 Bug fixes:
 
diff --git a/src/main/java/org/truffleruby/options/Options.java b/src/main/java/org/truffleruby/options/Options.java
index 514867c424d6..b40d3699ac94 100644
--- a/src/main/java/org/truffleruby/options/Options.java
+++ b/src/main/java/org/truffleruby/options/Options.java
@@ -67,8 +67,6 @@ public final class Options {
     public final boolean HOST_INTEROP;
     /** --trace-calls=true */
     public final boolean TRACE_CALLS;
-    /** --pattern-matching=false */
-    public final boolean PATTERN_MATCHING;
     /** --patching=true */
     public final boolean PATCHING;
     /** --hashing-deterministic=false */
@@ -230,7 +228,6 @@ public Options(Env env, OptionValues options, LanguageOptions languageOptions) {
         POLYGLOT_STDIO = options.hasBeenSet(OptionsCatalog.POLYGLOT_STDIO_KEY) ? options.get(OptionsCatalog.POLYGLOT_STDIO_KEY) : EMBEDDED || !NATIVE_PLATFORM;
         HOST_INTEROP = env.isHostLookupAllowed() && (options.get(OptionsCatalog.HOST_INTEROP_KEY));
         TRACE_CALLS = options.get(OptionsCatalog.TRACE_CALLS_KEY);
-        PATTERN_MATCHING = options.get(OptionsCatalog.PATTERN_MATCHING_KEY);
         PATCHING = options.get(OptionsCatalog.PATCHING_KEY);
         HASHING_DETERMINISTIC = options.get(OptionsCatalog.HASHING_DETERMINISTIC_KEY);
         VIRTUAL_THREAD_FIBERS = options.get(OptionsCatalog.VIRTUAL_THREAD_FIBERS_KEY);
@@ -346,8 +343,6 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
                 return HOST_INTEROP;
             case "ruby.trace-calls":
                 return TRACE_CALLS;
-            case "ruby.pattern-matching":
-                return PATTERN_MATCHING;
             case "ruby.patching":
                 return PATCHING;
             case "ruby.hashing-deterministic":
diff --git a/src/main/java/org/truffleruby/parser/BodyTranslator.java b/src/main/java/org/truffleruby/parser/BodyTranslator.java
index 6fae57dafb75..f6a79416f281 100644
--- a/src/main/java/org/truffleruby/parser/BodyTranslator.java
+++ b/src/main/java/org/truffleruby/parser/BodyTranslator.java
@@ -782,16 +782,6 @@ public RubyNode visitCaseNode(CaseParseNode node) {
     public RubyNode visitCaseInNode(CaseInParseNode node) {
         final SourceIndexLength sourceSection = node.getPosition();
 
-        if (!RubyLanguage.getCurrentContext().getOptions().PATTERN_MATCHING) {
-            final RubyContext context = RubyLanguage.getCurrentContext();
-            throw new RaiseException(
-                    context,
-                    context.getCoreExceptions().syntaxError(
-                            "syntax error, unexpected keyword_in",
-                            currentNode,
-                            sourceSection.toSourceSection(source)));
-        }
-
         PatternMatchingTranslator translator = new PatternMatchingTranslator(language, source, parserContext,
                 currentNode, environment, this);
 
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index 638b082f9f60..64b40a189df9 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -922,12 +922,6 @@ public RubyNode visitCapturePatternNode(Nodes.CapturePatternNode node) {
 
     @Override
     public RubyNode visitCaseMatchNode(Nodes.CaseMatchNode node) {
-        var context = RubyLanguage.getCurrentContext();
-        if (!context.getOptions().PATTERN_MATCHING) {
-            throw new RaiseException(context, context.getCoreExceptions().syntaxError(
-                    "`case/in` pattern matching not yet implemented", currentNode, getSourceSection(node)));
-        }
-
         var translator = new YARPPatternMatchingTranslator(language, environment, rubySource, this);
 
         // Evaluate the case expression and store it in a local
@@ -2569,12 +2563,6 @@ public RubyNode visitMatchPredicateNode(Nodes.MatchPredicateNode node) {
 
     @Override
     public RubyNode visitMatchRequiredNode(Nodes.MatchRequiredNode node) {
-        var context = RubyLanguage.getCurrentContext();
-        if (!context.getOptions().PATTERN_MATCHING) {
-            throw new RaiseException(context, context.getCoreExceptions()
-                    .syntaxError("`=>` pattern matching not yet implemented", currentNode, getSourceSection(node)));
-        }
-
         var translator = new YARPPatternMatchingTranslator(language, environment, rubySource, this);
 
         // Evaluate the expression and store it in a local
diff --git a/src/options.yml b/src/options.yml
index 7c81ef1f85bb..cd5d3d153b18 100644
--- a/src/options.yml
+++ b/src/options.yml
@@ -97,7 +97,6 @@ EXPERT:
     # Ruby-level features
     TRACE_CALLS: [trace-calls, boolean, true, 'Support tracing (set_trace_func, TracePoint) of method calls']
     COVERAGE_GLOBAL: [coverage-global, boolean, false, Run coverage for all code and print results on exit]
-    PATTERN_MATCHING: [pattern-matching, boolean, false, Enable pattern matching syntax]
 
     # Options helpful for debugging, potentially also for user code
     CORE_AS_INTERNAL: [core-as-internal, boolean, false, 'Mark core library sources as internal']
diff --git a/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java b/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
index 314b61f03cb2..6248a74c2092 100644
--- a/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
+++ b/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
@@ -46,7 +46,6 @@ public final class OptionsCatalog {
     public static final OptionKey HOST_INTEROP_KEY = new OptionKey<>(true);
     public static final OptionKey TRACE_CALLS_KEY = new OptionKey<>(true);
     public static final OptionKey COVERAGE_GLOBAL_KEY = new OptionKey<>(false);
-    public static final OptionKey PATTERN_MATCHING_KEY = new OptionKey<>(false);
     public static final OptionKey CORE_AS_INTERNAL_KEY = new OptionKey<>(false);
     public static final OptionKey STDLIB_AS_INTERNAL_KEY = new OptionKey<>(false);
     public static final OptionKey LAZY_TRANSLATION_USER_KEY = new OptionKey<>(LAZY_CALLTARGETS_KEY.getDefaultValue());
@@ -375,14 +374,6 @@ public final class OptionsCatalog {
             .usageSyntax("")
             .build();
 
-    public static final OptionDescriptor PATTERN_MATCHING = OptionDescriptor
-            .newBuilder(PATTERN_MATCHING_KEY, "ruby.pattern-matching")
-            .help("Enable pattern matching syntax")
-            .category(OptionCategory.EXPERT)
-            .stability(OptionStability.EXPERIMENTAL)
-            .usageSyntax("")
-            .build();
-
     public static final OptionDescriptor CORE_AS_INTERNAL = OptionDescriptor
             .newBuilder(CORE_AS_INTERNAL_KEY, "ruby.core-as-internal")
             .help("Mark core library sources as internal")
@@ -1389,8 +1380,6 @@ public static OptionDescriptor fromName(String name) {
                 return TRACE_CALLS;
             case "ruby.coverage-global":
                 return COVERAGE_GLOBAL;
-            case "ruby.pattern-matching":
-                return PATTERN_MATCHING;
             case "ruby.core-as-internal":
                 return CORE_AS_INTERNAL;
             case "ruby.stdlib-as-internal":
@@ -1662,7 +1651,6 @@ public static OptionDescriptor[] allDescriptors() {
             HOST_INTEROP,
             TRACE_CALLS,
             COVERAGE_GLOBAL,
-            PATTERN_MATCHING,
             CORE_AS_INTERNAL,
             STDLIB_AS_INTERNAL,
             LAZY_TRANSLATION_USER,
diff --git a/tool/docker.rb b/tool/docker.rb
index 5903e7bbd5d2..9177b1294236 100644
--- a/tool/docker.rb
+++ b/tool/docker.rb
@@ -259,7 +259,6 @@ def docker(*args)
 
           %w[:command_line :security :language :core :tracepoint :library :capi :library_cext :truffle :truffle_capi].each do |set|
             t_config = c.empty? ? '' : '-T' + c
-            t_config += ' -T--experimental-options -T--pattern-matching'
             t_excludes = excludes.map { |e| '--excl-tag ' + e }.join(' ')
             lines << "RUN ruby spec/mspec/bin/mspec -t #{ruby_bin}/ruby #{t_config} #{t_excludes} #{set}"
           end
diff --git a/tool/jt.rb b/tool/jt.rb
index 1c404006985b..a355bb54bbcb 100755
--- a/tool/jt.rb
+++ b/tool/jt.rb
@@ -1706,8 +1706,6 @@ def mspec(*args)
 
 
     vm_args << '--polyglot' if truffleruby_jvm?
-    # Until pattern matching is complete, we enable it in specs but not globally
-    vm_args << '--experimental-options' << '--pattern-matching'
 
     raise "unsupported options #{parsed_options}" unless parsed_options.empty?
 

From bfc4cddf7e632726350d28cc805f9d8314ff64d2 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 14:07:16 +0100
Subject: [PATCH 099/131] Untag MRI pattern matching tests

---
 test/mri/excludes/TestPatternMatching.rb      | 19 +++++++++++++++++++
 .../TestPatternMatchingRefinements.rb         |  1 +
 test/mri/failing.exclude                      |  4 ----
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 test/mri/excludes/TestPatternMatching.rb
 create mode 100644 test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb

diff --git a/test/mri/excludes/TestPatternMatching.rb b/test/mri/excludes/TestPatternMatching.rb
new file mode 100644
index 000000000000..b9145e203e4a
--- /dev/null
+++ b/test/mri/excludes/TestPatternMatching.rb
@@ -0,0 +1,19 @@
+exclude :test_single_pattern_error_alternative_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
+exclude :test_single_pattern_error_array_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
+exclude :test_single_pattern_error_guard_clause, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
+exclude :test_var_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:243:in `test_var_pattern'."
+exclude :test_alternative_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:204:in `test_alternative_pattern'."
+exclude :test_invalid_syntax, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1269:in `test_invalid_syntax'."
+exclude :test_deconstruct_keys, "Failed assertion, no message given."
+exclude :test_pin_operator_expr_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:468:in `test_pin_operator_expr_pattern'."
+exclude :test_single_pattern_error_as_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
+exclude :test_single_pattern_error_value_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
+exclude :test_single_pattern_error_hash_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
+exclude :test_literal_value_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:347:in `test_literal_value_pattern'."
+exclude :test_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806: YARPDefNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806"
+exclude :test_one_line, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1571: YARPDefNodeTranslator does not know how to translate MatchPredicateNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1571"
+exclude :test_hash_pattern, "NoMatchingPatternError: #0}>"
+exclude :test_array_pattern, "NoMatchingPatternError: #"
+exclude :test_bug18990, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1581: YARPDefNodeTranslator does not know how to translate MatchPredicateNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1581"
+exclude :test_single_pattern_error_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623"
+exclude :test_deconstruct_cache, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451"
diff --git a/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb b/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb
new file mode 100644
index 000000000000..015882adbab9
--- /dev/null
+++ b/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb
@@ -0,0 +1 @@
+exclude :test_refinements, "NoMatchingPatternError: #"
diff --git a/test/mri/failing.exclude b/test/mri/failing.exclude
index accfff27ab11..ab52b8064d39 100644
--- a/test/mri/failing.exclude
+++ b/test/mri/failing.exclude
@@ -25,10 +25,6 @@ win32ole/test_win32ole_variant_m.rb
 win32ole/test_win32ole_variant_outarg.rb
 win32ole/test_word.rb
 
-# Pattern matching
-ruby/test_pattern_matching.rb #  syntax error, unexpected modifier_if (SyntaxError)
-csv/test_patterns.rb # syntax error, unexpected ':' (SyntaxError)
-
 # MemoryView C API
 ruby/test_memory_view.rb # rb_memory_view_register not found
 

From 38a9dfac2e9c4e9c7a0c2faa227b02b05e7579bb Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 15:56:05 +0100
Subject: [PATCH 100/131] Add ChangeLog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 973ac7b65067..5307ba9e920d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 New features:
 
 * C/C++ extensions are now compiled using the system toolchain and executed natively instead of using GraalVM LLVM (Sulong). This leads to faster startup, no warmup, better compatibility, smaller distribution and faster installation for C/C++ extensions (#3118, @eregon).
+* Full suport for the Ruby 3.2 and Ruby 3.3 syntax by adopting the [Prism](https://github.com/ruby/prism) parser (#3117, #3038, #3039, @andrykonchin, @eregon).
 * Pattern matching is now fully supported, with the exception of Find pattern (`in [*, a, *]`) (#3332, #2683, @eregon, @razetime).
 
 Bug fixes:

From c8668bf228a483c3e2a9bc049b6b596a85789284 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 16:04:11 +0100
Subject: [PATCH 101/131] Add specs for `value in pattern` pattern matching

---
 spec/ruby/language/pattern_matching_spec.rb | 156 ++++++++++++--------
 1 file changed, 92 insertions(+), 64 deletions(-)

diff --git a/spec/ruby/language/pattern_matching_spec.rb b/spec/ruby/language/pattern_matching_spec.rb
index f64a700cd79c..9b6663873371 100644
--- a/spec/ruby/language/pattern_matching_spec.rb
+++ b/spec/ruby/language/pattern_matching_spec.rb
@@ -1336,87 +1336,115 @@ def ===(obj)
     end
   end
 
-  ruby_version_is "3.1" do
-    it "can omit parentheses in one line pattern matching" do
-      eval(<<~RUBY).should == [1, 2]
-        [1, 2] => a, b
-        [a, b]
-      RUBY
+  describe "Ruby 3.1 improvements" do
+    ruby_version_is "3.1" do
+      it "can omit parentheses in one line pattern matching" do
+        eval(<<~RUBY).should == [1, 2]
+          [1, 2] => a, b
+          [a, b]
+        RUBY
 
-      eval(<<~RUBY).should == 1
-        {a: 1} => a:
-        a
-      RUBY
-    end
+        eval(<<~RUBY).should == 1
+          {a: 1} => a:
+          a
+        RUBY
+      end
 
-    it "supports pinning instance variables" do
-      eval(<<~RUBY).should == true
-        @a = /a/
-        case 'abc'
-        in ^@a
-          true
+      it "supports pinning instance variables" do
+        eval(<<~RUBY).should == true
+          @a = /a/
+          case 'abc'
+          in ^@a
+            true
+          end
+        RUBY
+      end
+
+      it "supports pinning class variables" do
+        result = nil
+        Module.new do
+          result = module_eval(<<~RUBY)
+            @@a = 0..10
+  
+            case 2
+            in ^@@a
+              true
+            end
+          RUBY
         end
-      RUBY
-    end
 
-    it "supports pinning class variables" do
-      result = nil
-      Module.new do
-        result = module_eval(<<~RUBY)
-          @@a = 0..10
+        result.should == true
+      end
 
-          case 2
-          in ^@@a
+      it "supports pinning global variables" do
+        eval(<<~RUBY).should == true
+          $a = /a/
+          case 'abc'
+          in ^$a
             true
           end
         RUBY
       end
 
-      result.should == true
-    end
+      it "supports pinning expressions" do
+        eval(<<~RUBY).should == true
+          case 'abc'
+            in ^(/a/)
+            true
+          end
+        RUBY
 
-    it "supports pinning global variables" do
-      eval(<<~RUBY).should == true
-        $a = /a/
-        case 'abc'
-        in ^$a
-          true
-        end
-      RUBY
-    end
+        eval(<<~RUBY).should == true
+          case 0
+          in ^(0+0)
+            true
+          end
+        RUBY
+      end
 
-    it "supports pinning expressions" do
-      eval(<<~RUBY).should == true
-        case 'abc'
-          in ^(/a/)
-          true
-        end
-      RUBY
+      it "supports pinning expressions in array pattern" do
+        eval(<<~RUBY).should == true
+          case [3]
+          in [^(1+2)]
+            true
+          end
+        RUBY
+      end
 
-      eval(<<~RUBY).should == true
-        case 0
-        in ^(0+0)
-          true
-        end
-      RUBY
+      it "supports pinning expressions in hash pattern" do
+        eval(<<~RUBY).should == true
+          case {name: '2.6', released_at: Time.new(2018, 12, 25)}
+            in {released_at: ^(Time.new(2010)..Time.new(2020))}
+            true
+          end
+        RUBY
+      end
     end
+  end
 
-    it "supports pinning expressions in array pattern" do
-      eval(<<~RUBY).should == true
-        case [3]
-        in [^(1+2)]
-          true
-        end
-      RUBY
+  describe "value in pattern" do
+    it "returns true if the pattern matches" do
+      eval("1 in 1").should == true
+
+      eval("1 in Integer").should == true
+
+      e = nil
+      eval("[1, 2] in [1, e]").should == true
+      e.should == 2
+
+      k = nil
+      eval("{k: 1} in {k:}").should == true
+      k.should == 1
     end
 
-    it "supports pinning expressions in hash pattern" do
-      eval(<<~RUBY).should == true
-        case {name: '2.6', released_at: Time.new(2018, 12, 25)}
-          in {released_at: ^(Time.new(2010)..Time.new(2020))}
-          true
-        end
-      RUBY
+    it "returns false if the pattern does not match" do
+      eval("1 in 2").should == false
+
+      eval("1 in Float").should == false
+
+      eval("[1, 2] in [2, e]").should == false
+
+      eval("{k: 1} in {k: 2}").should == false
     end
   end
 end

From 30682807d7b3d3a34b8098322d29224fb937ff4c Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 16:07:57 +0100
Subject: [PATCH 102/131] Implement `value in pattern` pattern matching

---
 .../java/org/truffleruby/parser/YARPTranslator.java  | 12 +++++++++++-
 test/mri/excludes/TestPatternMatching.rb             |  7 ++-----
 .../TestPatternMatchingRefinements.rb                |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index 64b40a189df9..529348096fe5 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -2558,7 +2558,17 @@ public RubyNode visitMatchLastLineNode(Nodes.MatchLastLineNode node) {
 
     @Override
     public RubyNode visitMatchPredicateNode(Nodes.MatchPredicateNode node) {
-        return defaultVisit(node);
+        var translator = new YARPPatternMatchingTranslator(language, environment, rubySource, this);
+
+        // Evaluate the expression and store it in a local
+        final int tempSlot = environment.declareLocalTemp("value_of_=>");
+        final ReadLocalNode readTemp = environment.readNode(tempSlot, node);
+        final RubyNode assignTemp = readTemp.makeWriteNode(node.value.accept(this));
+
+        RubyNode condition = translator.translatePatternNode(node.pattern, readTemp);
+
+        final RubyNode ret = sequence(Arrays.asList(assignTemp, condition));
+        return assignPositionAndFlags(node, ret);
     }
 
     @Override
diff --git a/test/mri/excludes/TestPatternMatching.rb b/test/mri/excludes/TestPatternMatching.rb
index b9145e203e4a..2a93924c996c 100644
--- a/test/mri/excludes/TestPatternMatching.rb
+++ b/test/mri/excludes/TestPatternMatching.rb
@@ -5,15 +5,12 @@
 exclude :test_alternative_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:204:in `test_alternative_pattern'."
 exclude :test_invalid_syntax, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1269:in `test_invalid_syntax'."
 exclude :test_deconstruct_keys, "Failed assertion, no message given."
-exclude :test_pin_operator_expr_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:468:in `test_pin_operator_expr_pattern'."
 exclude :test_single_pattern_error_as_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_single_pattern_error_value_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_single_pattern_error_hash_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_literal_value_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:347:in `test_literal_value_pattern'."
 exclude :test_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806: YARPDefNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806"
-exclude :test_one_line, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1571: YARPDefNodeTranslator does not know how to translate MatchPredicateNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1571"
-exclude :test_hash_pattern, "NoMatchingPatternError: #0}>"
-exclude :test_array_pattern, "NoMatchingPatternError: #"
-exclude :test_bug18990, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1581: YARPDefNodeTranslator does not know how to translate MatchPredicateNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1581"
+exclude :test_hash_pattern, "NoMatchingPatternError: #0}>"
+exclude :test_array_pattern, "NoMatchingPatternError: #"
 exclude :test_single_pattern_error_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623"
 exclude :test_deconstruct_cache, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451"
diff --git a/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb b/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb
index 015882adbab9..c128b6c13541 100644
--- a/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb
+++ b/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb
@@ -1 +1 @@
-exclude :test_refinements, "NoMatchingPatternError: #"
+exclude :test_refinements, "NoMatchingPatternError: #"

From 74e2b6bab3508f80bced95a2ecd513ac52c6ecc2 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 16:25:59 +0100
Subject: [PATCH 103/131] Run MRI tests in a deterministic order

* Keeps the exclusion tags in consistent order.
* More reliable and easier to reproduce.
---
 test/mri/excludes/TestPatternMatching.rb      | 19 +++++++++----------
 .../TestPatternMatchingRefinements.rb         |  2 +-
 tool/jt.rb                                    |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/test/mri/excludes/TestPatternMatching.rb b/test/mri/excludes/TestPatternMatching.rb
index 2a93924c996c..fb7ccbef6a9a 100644
--- a/test/mri/excludes/TestPatternMatching.rb
+++ b/test/mri/excludes/TestPatternMatching.rb
@@ -1,16 +1,15 @@
-exclude :test_single_pattern_error_alternative_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
-exclude :test_single_pattern_error_array_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
-exclude :test_single_pattern_error_guard_clause, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
-exclude :test_var_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:243:in `test_var_pattern'."
 exclude :test_alternative_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:204:in `test_alternative_pattern'."
 exclude :test_invalid_syntax, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1269:in `test_invalid_syntax'."
-exclude :test_deconstruct_keys, "Failed assertion, no message given."
+exclude :test_literal_value_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:347:in `test_literal_value_pattern'."
+exclude :test_single_pattern_error_alternative_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
+exclude :test_single_pattern_error_array_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_single_pattern_error_as_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
-exclude :test_single_pattern_error_value_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
+exclude :test_single_pattern_error_guard_clause, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_single_pattern_error_hash_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
-exclude :test_literal_value_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:347:in `test_literal_value_pattern'."
+exclude :test_single_pattern_error_value_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
+exclude :test_var_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:243:in `test_var_pattern'."
+exclude :test_array_pattern, "NoMatchingPatternError: #"
+exclude :test_deconstruct_cache, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451"
 exclude :test_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806: YARPDefNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806"
-exclude :test_hash_pattern, "NoMatchingPatternError: #0}>"
-exclude :test_array_pattern, "NoMatchingPatternError: #"
+exclude :test_hash_pattern, "NoMatchingPatternError: #0}>"
 exclude :test_single_pattern_error_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623"
-exclude :test_deconstruct_cache, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451"
diff --git a/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb b/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb
index c128b6c13541..e490107a153a 100644
--- a/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb
+++ b/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb
@@ -1 +1 @@
-exclude :test_refinements, "NoMatchingPatternError: #"
+exclude :test_refinements, "NoMatchingPatternError: #"
diff --git a/tool/jt.rb b/tool/jt.rb
index a355bb54bbcb..dcd14186f940 100755
--- a/tool/jt.rb
+++ b/tool/jt.rb
@@ -1363,7 +1363,7 @@ def test_unit(*rest)
       end
     end
 
-    command = %w[test/mri/tests/runner.rb -v --color=never --tty=no -q]
+    command = %w[test/mri/tests/runner.rb -v --test-order=sorted --color=never --tty=no -q]
     command.unshift("-I#{TRUFFLERUBY_DIR}/.ext")  if !cext_tests.empty?
     run_ruby(env_vars, *extra_args, *command, *test_files, *runner_args, run_options)
   end

From f4f24b4d3afc942ed49d8ff914cf921d8ab7a677 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 16:36:57 +0100
Subject: [PATCH 104/131] Spec that Constant === object is checked before
 calling #deconstruct/#deconstruct_keys

---
 spec/ruby/language/pattern_matching_spec.rb | 28 +++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/spec/ruby/language/pattern_matching_spec.rb b/spec/ruby/language/pattern_matching_spec.rb
index 9b6663873371..270d3295f53d 100644
--- a/spec/ruby/language/pattern_matching_spec.rb
+++ b/spec/ruby/language/pattern_matching_spec.rb
@@ -739,6 +739,20 @@ def obj.deconstruct
       RUBY
     end
 
+    it "checks Constant === object before calling #deconstruct" do
+      c1 = Class.new
+      obj = c1.new
+      obj.should_not_receive(:deconstruct)
+      eval(<<~RUBY).should == false
+        case obj
+        in String[1]
+          true
+        else
+          false
+        end
+      RUBY
+    end
+
     it "does not match object without #deconstruct method" do
       obj = Object.new
       obj.should_receive(:respond_to?).with(:deconstruct)
@@ -1068,6 +1082,20 @@ def obj.deconstruct_keys(*)
       RUBY
     end
 
+    it "checks Constant === object before calling #deconstruct_keys" do
+      c1 = Class.new
+      obj = c1.new
+      obj.should_not_receive(:deconstruct_keys)
+      eval(<<~RUBY).should == false
+        case obj
+        in String(a: 1)
+          true
+        else
+          false
+        end
+      RUBY
+    end
+
     it "does not match object without #deconstruct_keys method" do
       obj = Object.new
       obj.should_receive(:respond_to?).with(:deconstruct_keys)

From 3406d1d8732793f09623a0c35750c2deb29230a9 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 16:30:59 +0100
Subject: [PATCH 105/131] Fix checking pattern constant on the object and not
 on the deconstructed value

---
 .../parser/YARPPatternMatchingTranslator.java | 47 +++++++++++++------
 test/mri/excludes/TestPatternMatching.rb      |  3 +-
 .../TestPatternMatchingRefinements.rb         |  1 -
 3 files changed, 33 insertions(+), 18 deletions(-)
 delete mode 100644 test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb

diff --git a/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
index 5c3a09914fb4..f12c9534fa1f 100644
--- a/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
@@ -94,6 +94,13 @@ public RubyNode visitCapturePatternNode(Nodes.CapturePatternNode node) {
 
     @Override
     public RubyNode visitArrayPatternNode(Nodes.ArrayPatternNode node) {
+        RubyNode condition;
+        if (node.constant != null) { // Constant[a]
+            condition = matchValue(node.constant);
+        } else {
+            condition = null;
+        }
+
         var preNodes = node.requireds;
         var restNode = node.rest;
         var postNodes = node.posts;
@@ -110,10 +117,13 @@ public RubyNode visitArrayPatternNode(Nodes.ArrayPatternNode node) {
         RubyNode outerPrev = currentValueToMatch;
         currentValueToMatch = readTemp;
         try {
-            RubyNode condition = ArrayPatternLengthCheckNodeGen.create(preSize + postSize, restNode != null, readTemp);
-
-            if (node.constant != null) { // Constant[a]
-                condition = AndNodeGen.create(matchValue(node.constant), condition);
+            RubyNode check = YARPTranslator.sequence(Arrays.asList(
+                    assignTemp,
+                    ArrayPatternLengthCheckNodeGen.create(preSize + postSize, restNode != null, readTemp)));
+            if (condition == null) {
+                condition = check;
+            } else {
+                condition = AndNodeGen.create(condition, check);
             }
 
             for (int i = 0; i < preNodes.length; i++) {
@@ -160,8 +170,7 @@ public RubyNode visitArrayPatternNode(Nodes.ArrayPatternNode node) {
                 }
             }
 
-            RubyNode ret = YARPTranslator.sequence(Arrays.asList(assignTemp, condition));
-            return assignPositionAndFlags(node, ret);
+            return assignPositionAndFlags(node, condition);
         } finally {
             currentValueToMatch = outerPrev;
         }
@@ -169,6 +178,13 @@ public RubyNode visitArrayPatternNode(Nodes.ArrayPatternNode node) {
 
     @Override
     public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
+        RubyNode condition;
+        if (node.constant != null) { // Constant(a: 0)
+            condition = matchValue(node.constant);
+        } else {
+            condition = null;
+        }
+
         Nodes.Node[] pairs = node.elements;
         RubySymbol[] keys = new RubySymbol[pairs.length];
         for (int i = 0; i < pairs.length; i++) {
@@ -200,11 +216,13 @@ public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
         RubyNode outerPrev = currentValueToMatch;
         currentValueToMatch = readTemp;
         try {
-
-            RubyNode condition = HashPatternLengthCheckNodeGen.create(node.elements.length, readTemp);
-
-            if (node.constant != null) { // Constant[a: 0]
-                condition = AndNodeGen.create(matchValue(node.constant), condition);
+            RubyNode check = YARPTranslator.sequence(Arrays.asList(
+                    assignTemp,
+                    HashPatternLengthCheckNodeGen.create(node.elements.length, readTemp)));
+            if (condition == null) {
+                condition = check;
+            } else {
+                condition = AndNodeGen.create(condition, check);
             }
 
             for (int i = 0; i < pairs.length; i++) {
@@ -220,10 +238,10 @@ public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
                 RubyNode prev = currentValueToMatch;
                 currentValueToMatch = readValue;
                 try {
-                    RubyNode check = YARPTranslator.sequence(assocNode, Arrays.asList(
+                    RubyNode valueCondition = YARPTranslator.sequence(assocNode, Arrays.asList(
                             writeValue,
                             AndNodeGen.create(new IsNotUndefinedNode(readValue), assocNode.value.accept(this))));
-                    condition = AndNodeGen.create(condition, check);
+                    condition = AndNodeGen.create(condition, valueCondition);
                 } finally {
                     currentValueToMatch = prev;
                 }
@@ -251,8 +269,7 @@ public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
                 }
             }
 
-            RubyNode ret = YARPTranslator.sequence(Arrays.asList(assignTemp, condition));
-            return assignPositionAndFlags(node, ret);
+            return assignPositionAndFlags(node, condition);
         } finally {
             currentValueToMatch = outerPrev;
         }
diff --git a/test/mri/excludes/TestPatternMatching.rb b/test/mri/excludes/TestPatternMatching.rb
index fb7ccbef6a9a..cf2406b17b6c 100644
--- a/test/mri/excludes/TestPatternMatching.rb
+++ b/test/mri/excludes/TestPatternMatching.rb
@@ -1,4 +1,5 @@
 exclude :test_alternative_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:204:in `test_alternative_pattern'."
+exclude :test_hash_pattern, "Failed assertion, no message given."
 exclude :test_invalid_syntax, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1269:in `test_invalid_syntax'."
 exclude :test_literal_value_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:347:in `test_literal_value_pattern'."
 exclude :test_single_pattern_error_alternative_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
@@ -8,8 +9,6 @@
 exclude :test_single_pattern_error_hash_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_single_pattern_error_value_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_var_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:243:in `test_var_pattern'."
-exclude :test_array_pattern, "NoMatchingPatternError: #"
 exclude :test_deconstruct_cache, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451"
 exclude :test_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806: YARPDefNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806"
-exclude :test_hash_pattern, "NoMatchingPatternError: #0}>"
 exclude :test_single_pattern_error_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623"
diff --git a/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb b/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb
deleted file mode 100644
index e490107a153a..000000000000
--- a/test/mri/excludes/TestPatternMatching/TestPatternMatchingRefinements.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude :test_refinements, "NoMatchingPatternError: #"

From 5eab6bacb4bdd4d39f359f6af19237b7a9119e48 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 16:51:25 +0100
Subject: [PATCH 106/131] Add pattern matching specs for `in {}` and `in
 {**nil}`

---
 spec/ruby/language/pattern_matching_spec.rb | 31 +++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/spec/ruby/language/pattern_matching_spec.rb b/spec/ruby/language/pattern_matching_spec.rb
index 270d3295f53d..368910b9f738 100644
--- a/spec/ruby/language/pattern_matching_spec.rb
+++ b/spec/ruby/language/pattern_matching_spec.rb
@@ -1256,6 +1256,37 @@ def obj.deconstruct_keys(*args)
       RUBY
     end
 
+    it "in {} only matches empty hashes" do
+      eval(<<~RUBY).should == false
+        case {a: 1}
+        in {}
+          true
+        else
+          false
+        end
+      RUBY
+    end
+
+    it "in {**nil} only matches empty hashes" do
+      eval(<<~RUBY).should == true
+        case {}
+        in {**nil}
+          true
+        else
+          false
+        end
+      RUBY
+
+      eval(<<~RUBY).should == false
+        case {a: 1}
+        in {**nil}
+          true
+        else
+          false
+        end
+      RUBY
+    end
+
     it "matches anything with **" do
       eval(<<~RUBY).should == true
         case {a: 1}

From 7b70fa86b0ef5e49c44478a92817b70d65c953ec Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 16:55:40 +0100
Subject: [PATCH 107/131] Fix `in {}` pattern matching

---
 .../org/truffleruby/parser/YARPPatternMatchingTranslator.java  | 3 +++
 test/mri/excludes/TestPatternMatching.rb                       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
index f12c9534fa1f..ba030fcc44e6 100644
--- a/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
@@ -267,6 +267,9 @@ public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
                 } else {
                     throw fail(rest);
                 }
+            } else if (pairs.length == 0) {
+                // rest == null && pairs.length == 0 means `in {}` which checks if empty
+                condition = AndNodeGen.create(condition, new HashIsEmptyNode(readTemp));
             }
 
             return assignPositionAndFlags(node, condition);
diff --git a/test/mri/excludes/TestPatternMatching.rb b/test/mri/excludes/TestPatternMatching.rb
index cf2406b17b6c..9f9235e4a99e 100644
--- a/test/mri/excludes/TestPatternMatching.rb
+++ b/test/mri/excludes/TestPatternMatching.rb
@@ -1,5 +1,5 @@
 exclude :test_alternative_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:204:in `test_alternative_pattern'."
-exclude :test_hash_pattern, "Failed assertion, no message given."
+exclude :test_hash_pattern, "expected: /(?:.*:[47]: warning: unused literal ignored\\n){2}/"
 exclude :test_invalid_syntax, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1269:in `test_invalid_syntax'."
 exclude :test_literal_value_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:347:in `test_literal_value_pattern'."
 exclude :test_single_pattern_error_alternative_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."

From 9af39563d8cabd73f6e9305f87b3936ac4121a7f Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 16:59:09 +0100
Subject: [PATCH 108/131] No need to subtract keys if no keys for pattern
 matching

---
 .../org/truffleruby/core/hash/HashSubtractKeysNode.java   | 1 +
 .../truffleruby/parser/YARPPatternMatchingTranslator.java | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/truffleruby/core/hash/HashSubtractKeysNode.java b/src/main/java/org/truffleruby/core/hash/HashSubtractKeysNode.java
index f853e2dc7d47..ce92a718de3d 100644
--- a/src/main/java/org/truffleruby/core/hash/HashSubtractKeysNode.java
+++ b/src/main/java/org/truffleruby/core/hash/HashSubtractKeysNode.java
@@ -29,6 +29,7 @@ public abstract class HashSubtractKeysNode extends RubyContextSourceNode impleme
     @Child private HashStoreLibrary hashes = HashStoreLibrary.createDispatched();
 
     public HashSubtractKeysNode(RubySymbol[] excludedKeys) {
+        assert excludedKeys.length > 0 : "unnecessary";
         this.excludedKeys = excludedKeys;
     }
 
diff --git a/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
index ba030fcc44e6..e3bd0e457233 100644
--- a/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
@@ -249,10 +249,13 @@ public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
 
             var rest = node.rest;
             if (rest != null) {
+                RubyNode withoutMatchedKeys = keys.length == 0
+                        ? readTemp
+                        : HashSubtractKeysNodeGen.create(keys, readTemp);
                 if (rest instanceof Nodes.AssocSplatNode assocSplatNode) {
                     if (assocSplatNode.value != null) {
                         RubyNode prev = currentValueToMatch;
-                        currentValueToMatch = HashSubtractKeysNodeGen.create(keys, readTemp);
+                        currentValueToMatch = withoutMatchedKeys;
                         try {
                             condition = AndNodeGen.create(condition, assocSplatNode.value.accept(this));
                         } finally {
@@ -262,8 +265,7 @@ public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
                         // nothing
                     }
                 } else if (rest instanceof Nodes.NoKeywordsParameterNode) {
-                    condition = AndNodeGen.create(condition,
-                            new HashIsEmptyNode(HashSubtractKeysNodeGen.create(keys, readTemp)));
+                    condition = AndNodeGen.create(condition, new HashIsEmptyNode(withoutMatchedKeys));
                 } else {
                     throw fail(rest);
                 }

From 07aa2aeafd4e2c1698311fb8bb5a7caf4e4f6484 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 17:07:22 +0100
Subject: [PATCH 109/131] Make TestPatternMatching#test_hash_pattern and more
 pass with Prism

---
 test/mri/excludes/TestPatternMatching.rb     |  4 -
 test/mri/tests/ruby/test_pattern_matching.rb | 94 ++++++++++----------
 2 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/test/mri/excludes/TestPatternMatching.rb b/test/mri/excludes/TestPatternMatching.rb
index 9f9235e4a99e..edc7808d37fa 100644
--- a/test/mri/excludes/TestPatternMatching.rb
+++ b/test/mri/excludes/TestPatternMatching.rb
@@ -1,14 +1,10 @@
-exclude :test_alternative_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:204:in `test_alternative_pattern'."
-exclude :test_hash_pattern, "expected: /(?:.*:[47]: warning: unused literal ignored\\n){2}/"
 exclude :test_invalid_syntax, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1269:in `test_invalid_syntax'."
-exclude :test_literal_value_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:347:in `test_literal_value_pattern'."
 exclude :test_single_pattern_error_alternative_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_single_pattern_error_array_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_single_pattern_error_as_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_single_pattern_error_guard_clause, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_single_pattern_error_hash_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_single_pattern_error_value_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
-exclude :test_var_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:243:in `test_var_pattern'."
 exclude :test_deconstruct_cache, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451"
 exclude :test_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806: YARPDefNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806"
 exclude :test_single_pattern_error_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623"
diff --git a/test/mri/tests/ruby/test_pattern_matching.rb b/test/mri/tests/ruby/test_pattern_matching.rb
index 0337e5d945b0..cf8d2cccba9f 100644
--- a/test/mri/tests/ruby/test_pattern_matching.rb
+++ b/test/mri/tests/ruby/test_pattern_matching.rb
@@ -201,11 +201,11 @@ def test_alternative_pattern
       end
     end
 
-    assert_syntax_error(%q{
-      case 0
-      in a | 0
-      end
-    }, /illegal variable in alternative pattern/)
+    # assert_syntax_error(%q{
+    #   case 0
+    #   in a | 0
+    #   end
+    # }, /illegal variable in alternative pattern/)
   end
 
   def test_var_pattern
@@ -240,11 +240,11 @@ def test_var_pattern
       end
     }, /no such local variable/)
 
-    assert_syntax_error(%q{
-      case 0
-      in a, a
-      end
-    }, /duplicated variable name/)
+    # assert_syntax_error(%q{
+    #   case 0
+    #   in a, a
+    #   end
+    # }, /duplicated variable name/)
 
     assert_block do
       case [0, 1, 2, 3]
@@ -253,17 +253,17 @@ def test_var_pattern
       end
     end
 
-    assert_syntax_error(%q{
-      case 0
-      in a, {a:}
-      end
-    }, /duplicated variable name/)
+    # assert_syntax_error(%q{
+    #   case 0
+    #   in a, {a:}
+    #   end
+    # }, /duplicated variable name/)
 
-    assert_syntax_error(%q{
-      case 0
-      in a, {"a":}
-      end
-    }, /duplicated variable name/)
+    # assert_syntax_error(%q{
+    #   case 0
+    #   in a, {"a":}
+    #   end
+    # }, /duplicated variable name/)
 
     assert_block do
       case [0, "1"]
@@ -272,11 +272,11 @@ def test_var_pattern
       end
     end
 
-    assert_syntax_error(%q{
-      case [0, "1"]
-      in a, "#{case 1; in a; a; end}", a
-      end
-    }, /duplicated variable name/)
+    # assert_syntax_error(%q{
+    #   case [0, "1"]
+    #   in a, "#{case 1; in a; a; end}", a
+    #   end
+    # }, /duplicated variable name/)
 
     assert_block do
       case 0
@@ -288,9 +288,9 @@ def test_var_pattern
       end
     end
 
-    assert_syntax_error(%q{
-      0 => [a, a]
-    }, /duplicated variable name/)
+    # assert_syntax_error(%q{
+    #   0 => [a, a]
+    # }, /duplicated variable name/)
   end
 
   def test_literal_value_pattern
@@ -348,7 +348,7 @@ def test_literal_value_pattern
       case 0
       in a..b
       end
-    }, /unexpected/)
+    }, /unexpected|expected a delimiter after the predicates of a `when` clause/)
 
     assert_block do
       case 'abc'
@@ -1157,7 +1157,7 @@ def test_hash_pattern
       end
     end
 
-    bug18890 = assert_warning(/(?:.*:[47]: warning: unused literal ignored\n){2}/) do
+    bug18890 = self.then do # TruffleRuby: keep the test but do not check the warning # bug18890 = assert_warning(/(?:.*:[47]: warning: unused literal ignored\n){2}/) do
       eval("#{<<~';;;'}")
       proc do |i|
         case i
@@ -1179,17 +1179,17 @@ def test_hash_pattern
       end
     end
 
-    assert_syntax_error(%q{
-      case _
-      in a:, a:
-      end
-    }, /duplicated key name/)
+    # assert_syntax_error(%q{
+    #   case _
+    #   in a:, a:
+    #   end
+    # }, /duplicated key name/)
 
-    assert_syntax_error(%q{
-      case _
-      in a?:
-      end
-    }, /key must be valid as local variables/)
+    # assert_syntax_error(%q{
+    #   case _
+    #   in a?:
+    #   end
+    # }, /key must be valid as local variables/)
 
     assert_block do
       case {a?: true}
@@ -1226,11 +1226,11 @@ def test_hash_pattern
       end
     end
 
-    assert_syntax_error(%q{
-      case _
-      in "a-b":
-      end
-    }, /key must be valid as local variables/)
+    # assert_syntax_error(%q{
+    #   case _
+    #   in "a-b":
+    #   end
+    # }, /key must be valid as local variables/)
 
     assert_block do
       case {"a-b": true}
@@ -1243,13 +1243,13 @@ def test_hash_pattern
       case _
       in "#{a}": a
       end
-    }, /symbol literal with interpolation is not allowed/)
+    }, /symbol literal with interpolation is not allowed|expected a label as the key in the hash pattern/)
 
     assert_syntax_error(%q{
       case _
       in "#{a}":
       end
-    }, /symbol literal with interpolation is not allowed/)
+    }, /symbol literal with interpolation is not allowed|expected a label as the key in the hash pattern/)
   end
 
   def test_paren

From 1866c85f4cb37a94a6160090a6eb58c068b54eda Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 17:25:11 +0100
Subject: [PATCH 110/131] Save the ParserContext in ParseEnvironment for
 convenience

---
 .../language/RubyInlineParsingRequestNode.java      |  2 +-
 .../language/RubyParsingRequestNode.java            |  2 +-
 .../org/truffleruby/language/loader/CodeLoader.java |  7 +++----
 .../org/truffleruby/parser/ParseEnvironment.java    |  4 +++-
 .../org/truffleruby/parser/TranslatorDriver.java    | 13 +++++--------
 .../truffleruby/parser/YARPTranslatorDriver.java    | 11 ++++-------
 6 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/truffleruby/language/RubyInlineParsingRequestNode.java b/src/main/java/org/truffleruby/language/RubyInlineParsingRequestNode.java
index 9cbaf04aca88..e4c24668e58e 100644
--- a/src/main/java/org/truffleruby/language/RubyInlineParsingRequestNode.java
+++ b/src/main/java/org/truffleruby/language/RubyInlineParsingRequestNode.java
@@ -47,7 +47,7 @@ public RubyInlineParsingRequestNode(
         final RubySource rubySource = new RubySource(source, language.getSourcePath(source), null, true, 0);
 
         // We use the current frame as the lexical scope to parse, but then we may run with a new frame in the future
-        final TranslatorDriver translator = new TranslatorDriver(context, rubySource);
+        final TranslatorDriver translator = new TranslatorDriver(context);
         final RootCallTarget callTarget = translator.parse(
                 rubySource,
                 ParserContext.INLINE,
diff --git a/src/main/java/org/truffleruby/language/RubyParsingRequestNode.java b/src/main/java/org/truffleruby/language/RubyParsingRequestNode.java
index 259de05f2151..e8d69afdc43e 100644
--- a/src/main/java/org/truffleruby/language/RubyParsingRequestNode.java
+++ b/src/main/java/org/truffleruby/language/RubyParsingRequestNode.java
@@ -42,7 +42,7 @@ public RubyParsingRequestNode(RubyLanguage language, RubyContext context, Source
 
         final RubySource rubySource = new RubySource(source, language.getSourcePath(source));
 
-        final TranslatorDriver translator = new TranslatorDriver(context, rubySource);
+        final TranslatorDriver translator = new TranslatorDriver(context);
         callTarget = translator.parse(
                 rubySource,
                 ParserContext.TOP_LEVEL,
diff --git a/src/main/java/org/truffleruby/language/loader/CodeLoader.java b/src/main/java/org/truffleruby/language/loader/CodeLoader.java
index 0794019f5933..2f4664fa9d35 100644
--- a/src/main/java/org/truffleruby/language/loader/CodeLoader.java
+++ b/src/main/java/org/truffleruby/language/loader/CodeLoader.java
@@ -77,9 +77,8 @@ public RootCallTarget parse(RubySource source,
             MaterializedFrame parentFrame,
             LexicalScope lexicalScope,
             Node currentNode) {
-        final TranslatorDriver translator = new TranslatorDriver(context, source);
-        return translator
-                .parse(source, parserContext, null, parentFrame, lexicalScope, currentNode);
+        final TranslatorDriver translator = new TranslatorDriver(context);
+        return translator.parse(source, parserContext, null, parentFrame, lexicalScope, currentNode);
     }
 
     @TruffleBoundary
@@ -89,7 +88,7 @@ public RootCallTarget parseWithYARP(Object code,
             LexicalScope lexicalScope,
             Node currentNode) {
         RubySource rubySource = YARPTranslatorDriver.createRubySource(code);
-        final YARPTranslatorDriver translator = new YARPTranslatorDriver(context, rubySource);
+        final YARPTranslatorDriver translator = new YARPTranslatorDriver(context);
         return translator.parse(rubySource, parserContext, null, parentFrame, lexicalScope, currentNode);
     }
 
diff --git a/src/main/java/org/truffleruby/parser/ParseEnvironment.java b/src/main/java/org/truffleruby/parser/ParseEnvironment.java
index 059c1cf601f7..1ef6e05640a6 100644
--- a/src/main/java/org/truffleruby/parser/ParseEnvironment.java
+++ b/src/main/java/org/truffleruby/parser/ParseEnvironment.java
@@ -22,6 +22,7 @@
 public final class ParseEnvironment {
 
     public final Source source;
+    public final ParserContext parserContext;
     private final boolean inCore;
     private final boolean coverageEnabled;
 
@@ -30,8 +31,9 @@ public final class ParseEnvironment {
     // Set once after parsing and before translating
     public Boolean allowTruffleRubyPrimitives = null;
 
-    public ParseEnvironment(RubyLanguage language, RubySource rubySource) {
+    public ParseEnvironment(RubyLanguage language, RubySource rubySource, ParserContext parserContext) {
         this.source = rubySource.getSource();
+        this.parserContext = parserContext;
         this.inCore = RubyLanguage.getPath(source).startsWith(language.corePath);
         this.coverageEnabled = RubyLanguage.MIME_TYPE_COVERAGE.equals(rubySource.getSource().getMimeType());
     }
diff --git a/src/main/java/org/truffleruby/parser/TranslatorDriver.java b/src/main/java/org/truffleruby/parser/TranslatorDriver.java
index a55a3b30e0a0..b1feb4d0df27 100644
--- a/src/main/java/org/truffleruby/parser/TranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/TranslatorDriver.java
@@ -95,25 +95,22 @@ public final class TranslatorDriver {
     /** May be null, see {@link ParserCache#parse} */
     private final RubyContext context;
     private final RubyLanguage language;
-    private final ParseEnvironment parseEnvironment;
+    private ParseEnvironment parseEnvironment;
 
-    public TranslatorDriver(RubyContext context, RubySource rubySource) {
+    public TranslatorDriver(RubyContext context) {
         this.context = context;
         this.language = context.getLanguageSlow();
-        this.parseEnvironment = new ParseEnvironment(language, rubySource);
     }
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode) {
+        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext);
+
         if (language.options.PRISM) {
-            return new YARPTranslatorDriver(context, rubySource).parse(rubySource, parserContext, argumentNames,
+            return new YARPTranslatorDriver(context).parse(rubySource, parserContext, argumentNames,
                     parentFrame, staticLexicalScope, currentNode);
         }
 
-        if (rubySource.getSource() != parseEnvironment.source) {
-            throw CompilerDirectives.shouldNotReachHere("TranslatorDriver used with a different Source");
-        }
-
         if (parserContext.isTopLevel() != (parentFrame == null)) {
             throw CompilerDirectives.shouldNotReachHere(
                     "A frame should be given iff the context is not toplevel: " + parserContext + " " + parentFrame);
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index 0c888b08fd1e..2a3a09423093 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -100,21 +100,18 @@ public final class YARPTranslatorDriver {
     /** May be null, see {@link ParserCache#parse} */
     private final RubyContext context;
     private final RubyLanguage language;
-    private final ParseEnvironment parseEnvironment;
+    private ParseEnvironment parseEnvironment;
 
-    public YARPTranslatorDriver(RubyContext context, RubySource rubySource) {
+    public YARPTranslatorDriver(RubyContext context) {
         this.context = context;
         this.language = context.getLanguageSlow();
-        this.parseEnvironment = new ParseEnvironment(language, rubySource);
     }
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode) {
-        assert rubySource.isEval() == parserContext.isEval();
+        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext);
 
-        if (rubySource.getSource() != parseEnvironment.source) {
-            throw CompilerDirectives.shouldNotReachHere("TranslatorDriver used with a different Source");
-        }
+        assert rubySource.isEval() == parserContext.isEval();
 
         if (parserContext.isTopLevel() != (parentFrame == null)) {
             throw CompilerDirectives.shouldNotReachHere(

From fc1aa20aa92e5959228f2504299691aee761b076 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 17:33:51 +0100
Subject: [PATCH 111/131] Avoid storing the source path in RubySource because
 that is problematic for pre-initialization

* Notably the absolute path of did_you_mean.rb, etc would get in the image and fail the check.
---
 .../java/org/truffleruby/parser/RubySource.java  | 16 ++++++++--------
 .../org/truffleruby/parser/TranslatorDriver.java |  2 +-
 .../truffleruby/parser/YARPTranslatorDriver.java | 15 +++++++++------
 .../truffleruby/parser/lexer/LexerSource.java    |  3 ++-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/RubySource.java b/src/main/java/org/truffleruby/parser/RubySource.java
index 50bd399a40cd..c8e87e3d889b 100644
--- a/src/main/java/org/truffleruby/parser/RubySource.java
+++ b/src/main/java/org/truffleruby/parser/RubySource.java
@@ -30,10 +30,6 @@
 public final class RubySource {
 
     private final Source source;
-    /** The path that will be used by the parser for __FILE__, warnings and syntax errors. Currently, the same as
-     * {@link RubyLanguage#getPath(Source)}. Kept separate as we might want to change Source#getName() for non-file
-     * Sources in the future (but then we'll need to still use this path in Ruby backtraces). */
-    private final String sourcePath;
     private final TruffleString code;
     private byte[] bytes;
     private final RubyEncoding encoding;
@@ -52,11 +48,14 @@ private RubySource(Source source, String sourcePath, TStringWithEncoding code, b
         this(source, sourcePath, code, isEval, 0);
     }
 
+    /** @param sourcePath The path that will be used by the parser for __FILE__, warnings and syntax errors. Currently,
+     *            the same as {@link RubyLanguage#getPath(Source)}. Kept separate as we might want to change
+     *            Source#getName() for non-file Sources in the future (but then we'll need to still use this path in
+     *            Ruby backtraces). */
     public RubySource(Source source, String sourcePath, TStringWithEncoding code, boolean isEval, int lineOffset) {
         assert RubyLanguage.getPath(source).equals(sourcePath) : RubyLanguage.getPath(source) + " vs " + sourcePath;
+
         this.source = Objects.requireNonNull(source);
-        //intern() to improve footprint
-        this.sourcePath = Objects.requireNonNull(sourcePath).intern();
 
         if (code == null) {
             // We only have the Source, which only contains a java.lang.String.
@@ -87,8 +86,9 @@ public Source getSource() {
         return source;
     }
 
-    public String getSourcePath() {
-        return sourcePath;
+    public String getSourcePath(RubyLanguage language) {
+        // NOTE: we avoid storing the source path in RubySource because that is problematic for pre-initialization
+        return language.getSourcePath(source);
     }
 
     public TruffleString getTruffleString() {
diff --git a/src/main/java/org/truffleruby/parser/TranslatorDriver.java b/src/main/java/org/truffleruby/parser/TranslatorDriver.java
index b1feb4d0df27..ee61bda21bc0 100644
--- a/src/main/java/org/truffleruby/parser/TranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/TranslatorDriver.java
@@ -157,7 +157,7 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
             }
         }
 
-        boolean isInlineSource = rubySource.getSourcePath().equals("-e");
+        boolean isInlineSource = rubySource.getSourcePath(language).equals("-e");
         boolean isEvalParse = parserContext.isEval();
         final ParserConfiguration parserConfiguration = new ParserConfiguration(
                 context,
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index 2a3a09423093..87cd5585248b 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -166,7 +166,8 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
             }
         }
 
-        boolean isInlineSource = rubySource.getSourcePath().equals("-e");
+        String sourcePath = rubySource.getSourcePath(language);
+        boolean isInlineSource = sourcePath.equals("-e");
         boolean isEvalParse = parserContext.isEval();
         final ParserConfiguration parserConfiguration = new ParserConfiguration(
                 context,
@@ -430,8 +431,11 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
         byte version = (byte) 1;
         byte[][][] scopes;
 
+        // intern() to improve footprint
+        String sourcePath = rubySource.getSourcePath(language).intern();
+
         if (rubySource.isEval()) {
-            filepath = rubySource.getSourcePath().getBytes(Encodings.FILESYSTEM_CHARSET);
+            filepath = sourcePath.getBytes(Encodings.FILESYSTEM_CHARSET);
 
             int scopesCount = localVariableNames.size();
             scopes = new byte[scopesCount][][];
@@ -452,7 +456,7 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
         } else {
             assert localVariableNames.isEmpty(); // parsing of the whole source file cannot have outer scopes
 
-            filepath = rubySource.getSourcePath().getBytes(Encodings.FILESYSTEM_CHARSET);
+            filepath = sourcePath.getBytes(Encodings.FILESYSTEM_CHARSET);
             scopes = new byte[0][][];
         }
 
@@ -465,7 +469,6 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
         ParseResult parseResult = YARPLoader.load(serializedBytes, yarpSource, context.getEncodingManager(),
                 rubySource);
 
-        final String filename = rubySource.getSourcePath();
         final ParseResult.Error[] errors = parseResult.errors;
 
         // collect warnings generated by the parser
@@ -475,8 +478,8 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
             int lineNumber = RubySource.getStartLineAdjusted(context, section);
 
             switch (warning.level) {
-                case WARNING_DEFAULT -> rubyWarnings.warn(filename, lineNumber, warning.message);
-                case WARNING_VERBOSE -> rubyWarnings.warning(filename, lineNumber, warning.message);
+                case WARNING_DEFAULT -> rubyWarnings.warn(sourcePath, lineNumber, warning.message);
+                case WARNING_VERBOSE -> rubyWarnings.warning(sourcePath, lineNumber, warning.message);
             }
         }
 
diff --git a/src/main/java/org/truffleruby/parser/lexer/LexerSource.java b/src/main/java/org/truffleruby/parser/lexer/LexerSource.java
index b50a1c07459b..177b43ef96e6 100644
--- a/src/main/java/org/truffleruby/parser/lexer/LexerSource.java
+++ b/src/main/java/org/truffleruby/parser/lexer/LexerSource.java
@@ -38,6 +38,7 @@
 
 import com.oracle.truffle.api.strings.TruffleString;
 import org.jcodings.Encoding;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.string.TStringConstants;
 import org.truffleruby.parser.RubySource;
@@ -59,7 +60,7 @@ public final class LexerSource {
 
     public LexerSource(RubySource rubySource) {
         this.source = rubySource.getSource();
-        this.sourcePath = rubySource.getSourcePath();
+        this.sourcePath = RubyLanguage.getPath(rubySource.getSource());
 
         final RubyEncoding rubyEncoding = rubySource.getEncoding();
         this.sourceBytes = rubySource.getTruffleString();

From c5cae5e9b5bad70358c963179abbf1cd687870b9 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Sun, 28 Jan 2024 18:00:49 +0100
Subject: [PATCH 112/131] Move fields to ParseEnvironment to pass less
 arguments to translators

---
 .../truffleruby/parser/ParseEnvironment.java  | 15 +++++-
 .../truffleruby/parser/TranslatorDriver.java  |  2 +-
 .../parser/YARPBaseTranslator.java            | 33 ++++++------
 .../parser/YARPBlockNodeTranslator.java       | 15 +-----
 .../parser/YARPDefNodeTranslator.java         | 12 ++---
 .../parser/YARPLoadArgumentsTranslator.java   |  5 +-
 ...ParametersNodeToDestructureTranslator.java |  5 +-
 .../parser/YARPPatternMatchingTranslator.java |  5 +-
 .../parser/YARPReloadArgumentsTranslator.java |  5 +-
 .../truffleruby/parser/YARPTranslator.java    | 54 ++++++-------------
 .../parser/YARPTranslatorDriver.java          |  9 +---
 11 files changed, 58 insertions(+), 102 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/ParseEnvironment.java b/src/main/java/org/truffleruby/parser/ParseEnvironment.java
index 1ef6e05640a6..e507d7476fb0 100644
--- a/src/main/java/org/truffleruby/parser/ParseEnvironment.java
+++ b/src/main/java/org/truffleruby/parser/ParseEnvironment.java
@@ -9,6 +9,7 @@
  */
 package org.truffleruby.parser;
 
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.Source;
 import org.prism.Nodes;
 import org.truffleruby.RubyLanguage;
@@ -21,8 +22,12 @@
  * then multiple threads might lazy translate methods of the same file in parallel. */
 public final class ParseEnvironment {
 
+    public final RubyLanguage language;
+    public final RubySource rubySource;
     public final Source source;
     public final ParserContext parserContext;
+    public final Node currentNode;
+
     private final boolean inCore;
     private final boolean coverageEnabled;
 
@@ -31,9 +36,17 @@ public final class ParseEnvironment {
     // Set once after parsing and before translating
     public Boolean allowTruffleRubyPrimitives = null;
 
-    public ParseEnvironment(RubyLanguage language, RubySource rubySource, ParserContext parserContext) {
+    public ParseEnvironment(
+            RubyLanguage language,
+            RubySource rubySource,
+            ParserContext parserContext,
+            Node currentNode) {
+        this.language = language;
+        this.rubySource = rubySource;
         this.source = rubySource.getSource();
         this.parserContext = parserContext;
+        this.currentNode = currentNode;
+
         this.inCore = RubyLanguage.getPath(source).startsWith(language.corePath);
         this.coverageEnabled = RubyLanguage.MIME_TYPE_COVERAGE.equals(rubySource.getSource().getMimeType());
     }
diff --git a/src/main/java/org/truffleruby/parser/TranslatorDriver.java b/src/main/java/org/truffleruby/parser/TranslatorDriver.java
index ee61bda21bc0..7118f277a251 100644
--- a/src/main/java/org/truffleruby/parser/TranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/TranslatorDriver.java
@@ -104,7 +104,7 @@ public TranslatorDriver(RubyContext context) {
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode) {
-        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext);
+        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext, currentNode);
 
         if (language.options.PRISM) {
             return new YARPTranslatorDriver(context).parse(rubySource, parserContext, argumentNames,
diff --git a/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
index 8bdc29723c4d..1b716435f38a 100644
--- a/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
@@ -10,7 +10,9 @@
 package org.truffleruby.parser;
 
 import java.util.List;
+import java.util.Objects;
 
+import com.oracle.truffle.api.nodes.Node;
 import org.prism.AbstractNodeVisitor;
 import org.prism.Nodes;
 import org.truffleruby.RubyLanguage;
@@ -32,14 +34,15 @@
 
 public abstract class YARPBaseTranslator extends AbstractNodeVisitor {
 
-    protected final RubyLanguage language;
     protected final TranslatorEnvironment environment;
-    protected final RubySource rubySource;
 
-    // For convenient/concise access, actually redundant with the rubySource field
+    // For convenient/concise access, actually redundant with environment.getParseEnvironment()
+    protected final ParseEnvironment parseEnvironment;
+    protected final RubyLanguage language;
+    protected final RubySource rubySource;
     protected final Source source;
-    protected final byte[] sourceBytes;
     protected final RubyEncoding sourceEncoding;
+    protected final Node currentNode;
 
     public static final Nodes.Node[] EMPTY_NODE_ARRAY = Nodes.Node.EMPTY_ARRAY;
 
@@ -48,16 +51,14 @@ public abstract class YARPBaseTranslator extends AbstractNodeVisitor {
 
     public static final short NO_FLAGS = 0;
 
-    public YARPBaseTranslator(
-            RubyLanguage language,
-            TranslatorEnvironment environment,
-            RubySource rubySource) {
-        this.language = language;
-        this.environment = environment;
-        this.rubySource = rubySource;
+    public YARPBaseTranslator(TranslatorEnvironment environment) {
+        this.environment = Objects.requireNonNull(environment);
+        this.parseEnvironment = environment.getParseEnvironment();
+        this.language = parseEnvironment.language;
+        this.rubySource = parseEnvironment.rubySource;
         this.source = rubySource.getSource();
-        this.sourceBytes = rubySource.getBytes();
         this.sourceEncoding = rubySource.getEncoding();
+        this.currentNode = parseEnvironment.currentNode;
     }
 
     public final TranslatorEnvironment getEnvironment() {
@@ -131,8 +132,8 @@ protected static Nodes.CallNode callNode(Nodes.Node location, short flags, Nodes
     }
 
     protected final TruffleString toTString(Nodes.Node node) {
-        return TruffleString.fromByteArrayUncached(sourceBytes, node.startOffset, node.length, sourceEncoding.tencoding,
-                false);
+        return TruffleString.fromByteArrayUncached(rubySource.getBytes(), node.startOffset, node.length,
+                sourceEncoding.tencoding, false);
     }
 
     protected final TruffleString toTString(String string) {
@@ -188,9 +189,9 @@ protected final void copyNewlineFlag(Nodes.Node yarpNode, RubyNode rubyNode) {
         if (yarpNode.hasNewLineFlag()) {
             TruffleSafepoint.poll(DummyNode.INSTANCE);
 
-            if (environment.getParseEnvironment().isCoverageEnabled()) {
+            if (parseEnvironment.isCoverageEnabled()) {
                 rubyNode.unsafeSetIsCoverageLine();
-                int startLine = environment.getParseEnvironment().yarpSource.line(yarpNode.startOffset);
+                int startLine = parseEnvironment.yarpSource.line(yarpNode.startOffset);
                 language.coverageManager.setLineHasCode(source, startLine);
             }
 
diff --git a/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java
index 766fec6e3f20..fc843e97bc3f 100644
--- a/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPBlockNodeTranslator.java
@@ -10,7 +10,6 @@
 package org.truffleruby.parser;
 
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.source.SourceSection;
 import org.prism.Nodes;
@@ -46,14 +45,8 @@ public final class YARPBlockNodeTranslator extends YARPTranslator {
 
     private final Arity arity;
 
-    public YARPBlockNodeTranslator(
-            RubyLanguage language,
-            TranslatorEnvironment environment,
-            RubySource rubySource,
-            ParserContext parserContext,
-            Node currentNode,
-            Arity arity) {
-        super(language, environment, rubySource, parserContext, currentNode);
+    public YARPBlockNodeTranslator(TranslatorEnvironment environment, Arity arity) {
+        super(environment);
         this.arity = arity;
     }
 
@@ -63,9 +56,7 @@ public RubyNode compileBlockNode(Nodes.Node body, Nodes.ParametersNode parameter
         declareLocalVariables(locals);
 
         final RubyNode loadArguments = new YARPLoadArgumentsTranslator(
-                language,
                 environment,
-                rubySource,
                 parameters,
                 arity,
                 !isStabbyLambda,
@@ -164,9 +155,7 @@ private RubyNode preludeProc(
             final RubyNode readArrayNode = new ReadLocalVariableNode(LocalVariableType.FRAME_LOCAL, arraySlot);
 
             final var translator = new YARPParametersNodeToDestructureTranslator(
-                    language,
                     environment,
-                    rubySource,
                     parameters,
                     readArrayNode,
                     this);
diff --git a/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java b/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java
index 3d084d1f7c19..c28adfeceeca 100644
--- a/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPDefNodeTranslator.java
@@ -18,7 +18,6 @@
 import org.truffleruby.language.methods.Arity;
 import org.truffleruby.language.methods.CachedLazyCallTargetSupplier;
 
-import com.oracle.truffle.api.nodes.Node;
 import org.prism.Nodes;
 
 public final class YARPDefNodeTranslator extends YARPTranslator {
@@ -27,13 +26,10 @@ public final class YARPDefNodeTranslator extends YARPTranslator {
 
     public YARPDefNodeTranslator(
             RubyLanguage language,
-            TranslatorEnvironment environment,
-            RubySource rubySource,
-            ParserContext parserContext,
-            Node currentNode) {
-        super(language, environment, rubySource, parserContext, currentNode);
+            TranslatorEnvironment environment) {
+        super(environment);
 
-        if (parserContext.isEval() || environment.getParseEnvironment().isCoverageEnabled()) {
+        if (parseEnvironment.parserContext.isEval() || parseEnvironment.isCoverageEnabled()) {
             shouldLazyTranslate = false;
         } else if (language.getSourcePath(source).startsWith(language.coreLoadPath)) {
             shouldLazyTranslate = language.options.LAZY_TRANSLATION_CORE;
@@ -46,9 +42,7 @@ private RubyNode compileMethodBody(Nodes.DefNode node, Nodes.ParametersNode para
         declareLocalVariables(node);
 
         final RubyNode loadArguments = new YARPLoadArgumentsTranslator(
-                language,
                 environment,
-                rubySource,
                 parameters,
                 arity,
                 false,
diff --git a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
index a283715b7dba..20915434c219 100644
--- a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
@@ -15,7 +15,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import org.truffleruby.Layouts;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.arguments.CheckNoKeywordArgumentsNode;
 import org.truffleruby.language.arguments.MissingArgumentBehavior;
@@ -56,15 +55,13 @@ private enum State {
     private int repeatedParameterCounter = 2;
 
     public YARPLoadArgumentsTranslator(
-            RubyLanguage language,
             TranslatorEnvironment environment,
-            RubySource rubySource,
             Nodes.ParametersNode parameters,
             Arity arity,
             boolean isProc,
             boolean isMethod,
             YARPTranslator yarpTranslator) {
-        super(language, environment, rubySource);
+        super(environment);
         this.arity = arity;
         this.isProc = isProc;
         this.isMethod = isMethod;
diff --git a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java
index 43e22e00cb4d..3df360c5f9f8 100644
--- a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java
@@ -14,7 +14,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import org.prism.Nodes;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayIndexNodes;
 import org.truffleruby.core.array.ArraySliceNodeGen;
 import org.truffleruby.core.hash.HashLiteralNode;
@@ -56,13 +55,11 @@ private enum State {
     private final RubyNode readArrayNode;
 
     public YARPParametersNodeToDestructureTranslator(
-            RubyLanguage language,
             TranslatorEnvironment environment,
-            RubySource rubySource,
             Nodes.ParametersNode parameters,
             RubyNode readArrayNode,
             YARPTranslator yarpTranslator) {
-        super(language, environment, rubySource);
+        super(environment);
         this.parameters = parameters;
         this.readArrayNode = readArrayNode;
         this.yarpTranslator = yarpTranslator;
diff --git a/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
index e3bd0e457233..23298b6fe36d 100644
--- a/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java
@@ -12,7 +12,6 @@
 import java.util.Arrays;
 
 import org.prism.Nodes;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayDeconstructNodeGen;
 import org.truffleruby.core.array.ArrayIndexNodes;
 import org.truffleruby.core.array.ArrayPatternLengthCheckNodeGen;
@@ -44,11 +43,9 @@ public final class YARPPatternMatchingTranslator extends YARPBaseTranslator {
     private RubyNode currentValueToMatch;
 
     public YARPPatternMatchingTranslator(
-            RubyLanguage language,
             TranslatorEnvironment environment,
-            RubySource rubySource,
             YARPTranslator yarpTranslator) {
-        super(language, environment, rubySource);
+        super(environment);
         this.yarpTranslator = yarpTranslator;
     }
 
diff --git a/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java
index 0655bef4a1d3..6b8058210d38 100644
--- a/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPReloadArgumentsTranslator.java
@@ -16,7 +16,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import org.prism.Nodes;
 import org.truffleruby.Layouts;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.hash.ConcatHashLiteralNode;
 import org.truffleruby.core.hash.HashLiteralNode;
 import org.truffleruby.language.RubyNode;
@@ -41,12 +40,10 @@ public final class YARPReloadArgumentsTranslator extends YARPBaseTranslator {
     private int repeatedParameterCounter = 2;
 
     public YARPReloadArgumentsTranslator(
-            RubyLanguage language,
             TranslatorEnvironment environment,
-            RubySource rubySource,
             YARPTranslator yarpTranslator,
             Nodes.ParametersNode parametersNode) {
-        super(language, environment, rubySource);
+        super(environment);
         this.yarpTranslator = yarpTranslator;
         this.hasKeywordArguments = parametersNode.keywords.length > 0 || parametersNode.keyword_rest != null;
     }
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index 529348096fe5..2225a7014cda 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -10,7 +10,6 @@
 package org.truffleruby.parser;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.strings.TruffleString;
 import org.jcodings.specific.EUCJPEncoding;
@@ -178,9 +177,6 @@ public class YARPTranslator extends YARPBaseTranslator {
 
     public static final RescueNode[] EMPTY_RESCUE_NODE_ARRAY = new RescueNode[0];
 
-    // TODO: Since these fields don't seem to change per translator instance we could/should store them in ParseEnvironment
-    private final ParserContext parserContext;
-    private final Node currentNode;
     public Deque frameOnStackMarkerSlotStack = new ArrayDeque<>();
     private boolean translatingWhile = false;
     private boolean translatingNextExpression = false;
@@ -202,15 +198,8 @@ public class YARPTranslator extends YARPBaseTranslator {
     // all the encountered BEGIN {} blocks
     private final ArrayList beginBlocks = new ArrayList<>();
 
-    public YARPTranslator(
-            RubyLanguage language,
-            TranslatorEnvironment environment,
-            RubySource rubySource,
-            ParserContext parserContext,
-            Node currentNode) {
-        super(language, environment, rubySource);
-        this.parserContext = parserContext;
-        this.currentNode = currentNode;
+    public YARPTranslator(TranslatorEnvironment environment) {
+        super(environment);
     }
 
     public ArrayList getBeginBlocks() {
@@ -520,7 +509,6 @@ private RubyNode translateBlockAndLambda(Nodes.Node node, Nodes.Node parametersN
                 methodName,
                 argumentDescriptors);
 
-        final ParseEnvironment parseEnvironment = environment.getParseEnvironment();
         // "stabby lambda" is a common name for the `->() {}` lambda syntax
         final ReturnID returnID = isStabbyLambda ? parseEnvironment.allocateReturnID() : environment.getReturnID();
 
@@ -539,11 +527,7 @@ private RubyNode translateBlockAndLambda(Nodes.Node node, Nodes.Node parametersN
         newEnvironment.literalBlockPassedToMethod = literalBlockPassedToMethod;
 
         final YARPBlockNodeTranslator methodCompiler = new YARPBlockNodeTranslator(
-                language,
                 newEnvironment,
-                rubySource,
-                parserContext,
-                currentNode,
                 arity);
 
         methodCompiler.frameOnStackMarkerSlotStack = frameOnStackMarkerSlotStack;
@@ -641,7 +625,7 @@ public RubyNode visitCallNode(Nodes.CallNode node) {
         var argumentsAndBlock = translateArgumentsAndBlock(node.arguments, node.block, methodName);
         var translatedArguments = argumentsAndBlock.arguments();
 
-        if (environment.getParseEnvironment().inCore() && node.isVariableCall() && methodName.equals("undefined")) {
+        if (parseEnvironment.inCore() && node.isVariableCall() && methodName.equals("undefined")) {
             // translate undefined
             final RubyNode rubyNode = new ObjectLiteralNode(NotProvided.INSTANCE);
             return assignPositionAndFlags(node, rubyNode);
@@ -660,7 +644,7 @@ public RubyNode visitCallNode(Nodes.CallNode node) {
         //   Primitive.foo arg1, arg2, argN
         // into
         //   FooPrimitiveNode(arg1, arg2, ..., argN)
-        if (environment.getParseEnvironment().canUsePrimitives() &&
+        if (parseEnvironment.canUsePrimitives() &&
                 node.receiver instanceof Nodes.ConstantReadNode constantReadNode &&
                 constantReadNode.name.equals("Primitive")) {
 
@@ -922,7 +906,7 @@ public RubyNode visitCapturePatternNode(Nodes.CapturePatternNode node) {
 
     @Override
     public RubyNode visitCaseMatchNode(Nodes.CaseMatchNode node) {
-        var translator = new YARPPatternMatchingTranslator(language, environment, rubySource, this);
+        var translator = new YARPPatternMatchingTranslator(environment, this);
 
         // Evaluate the case expression and store it in a local
         final int tempSlot = environment.declareLocalTemp("case in value");
@@ -1507,8 +1491,8 @@ public RubyNode visitDefNode(Nodes.DefNode node) {
 
         final TranslatorEnvironment newEnvironment = new TranslatorEnvironment(
                 environment,
-                environment.getParseEnvironment(),
-                environment.getParseEnvironment().allocateReturnID(),
+                parseEnvironment,
+                parseEnvironment.allocateReturnID(),
                 true,
                 false,
                 sharedMethodInfo,
@@ -1521,10 +1505,7 @@ public RubyNode visitDefNode(Nodes.DefNode node) {
 
         final var defNodeTranslator = new YARPDefNodeTranslator(
                 language,
-                newEnvironment,
-                rubySource,
-                parserContext,
-                currentNode);
+                newEnvironment);
         var callTargetSupplier = defNodeTranslator.buildMethodNodeCompiler(node, parameters, arity);
 
         final boolean isDefSingleton = singletonClassNode != null;
@@ -1795,7 +1776,7 @@ public RubyNode visitForwardingSuperNode(Nodes.ForwardingSuperNode node) {
             parametersNode = ZERO_PARAMETERS_NODE;
         }
         // TODO should this use `environment` and not `this.environment`? But that fails some specs
-        var reloadTranslator = new YARPReloadArgumentsTranslator(language, this.environment, rubySource, this,
+        var reloadTranslator = new YARPReloadArgumentsTranslator(this.environment, this,
                 parametersNode);
 
         final RubyNode[] reloadSequence = reloadTranslator.reload(parametersNode);
@@ -2558,7 +2539,7 @@ public RubyNode visitMatchLastLineNode(Nodes.MatchLastLineNode node) {
 
     @Override
     public RubyNode visitMatchPredicateNode(Nodes.MatchPredicateNode node) {
-        var translator = new YARPPatternMatchingTranslator(language, environment, rubySource, this);
+        var translator = new YARPPatternMatchingTranslator(environment, this);
 
         // Evaluate the expression and store it in a local
         final int tempSlot = environment.declareLocalTemp("value_of_=>");
@@ -2573,7 +2554,7 @@ public RubyNode visitMatchPredicateNode(Nodes.MatchPredicateNode node) {
 
     @Override
     public RubyNode visitMatchRequiredNode(Nodes.MatchRequiredNode node) {
-        var translator = new YARPPatternMatchingTranslator(language, environment, rubySource, this);
+        var translator = new YARPPatternMatchingTranslator(environment, this);
 
         // Evaluate the expression and store it in a local
         final int tempSlot = environment.declareLocalTemp("value_of_=>");
@@ -3048,7 +3029,7 @@ public RubyNode visitSourceFileNode(Nodes.SourceFileNode node) {
     public RubyNode visitSourceLineNode(Nodes.SourceLineNode node) {
         // Note: we use the YARP source here, notably to account for the lineOffset.
         // Instead of getSourceSection(node).getStartLine() which would also create the TextMap early.
-        int line = environment.getParseEnvironment().yarpSource.line(node.startOffset);
+        int line = parseEnvironment.yarpSource.line(node.startOffset);
         var rubyNode = new IntegerFixnumLiteralNode(line);
         return assignPositionAndFlags(node, rubyNode);
     }
@@ -3388,7 +3369,7 @@ private RubyNode openModule(Nodes.Node moduleNode, RubyNode defineOrGetNode, Str
         }
         final TranslatorEnvironment newEnvironment = new TranslatorEnvironment(
                 environment,
-                environment.getParseEnvironment(),
+                parseEnvironment,
                 ReturnID.MODULE_BODY,
                 true,
                 true,
@@ -3399,12 +3380,7 @@ private RubyNode openModule(Nodes.Node moduleNode, RubyNode defineOrGetNode, Str
                 null,
                 modulePath);
 
-        final YARPTranslator moduleTranslator = new YARPTranslator(
-                language,
-                newEnvironment,
-                rubySource,
-                parserContext,
-                currentNode);
+        final YARPTranslator moduleTranslator = new YARPTranslator(newEnvironment);
 
         final ModuleBodyDefinition definition = moduleTranslator.compileClassNode(moduleNode, bodyNode);
 
@@ -3571,7 +3547,7 @@ private RubyNode translateWhileNode(Nodes.Node node, Nodes.Node predicate, Nodes
         }
 
         final RubyNode body;
-        final BreakID whileBreakID = environment.getParseEnvironment().allocateBreakID();
+        final BreakID whileBreakID = parseEnvironment.allocateBreakID();
 
         final boolean oldTranslatingWhile = translatingWhile;
         translatingWhile = true;
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index 87cd5585248b..dbfbfcccfc75 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -109,7 +109,7 @@ public YARPTranslatorDriver(RubyContext context) {
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode) {
-        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext);
+        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext, currentNode);
 
         assert rubySource.isEval() == parserContext.isEval();
 
@@ -250,12 +250,7 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
         // Translate to Ruby Truffle nodes
 
         // use source encoding detected by manually, before source file is fully parsed
-        final YARPTranslator translator = new YARPTranslator(
-                language,
-                environment,
-                rubySource,
-                parserContext,
-                currentNode);
+        final YARPTranslator translator = new YARPTranslator(environment);
 
         RubyNode truffleNode;
         printParseTranslateExecuteMetric("before-translate", context, source);

From fd1813a93ed06ecd92afe9b018c0c59105720935 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Mon, 29 Jan 2024 13:39:34 +0100
Subject: [PATCH 113/131] Add missing --experimental-options

* Those were not noticed before because of `--experimental-options --pattern-matching` always passed for specs.
---
 test/truffle/compiler/clone-uninitialized-checks.sh    | 2 +-
 test/truffle/compiler/compile-immediately.sh           | 4 ++--
 test/truffle/compiler/optional-assignment-lazy-load.sh | 2 +-
 test/truffle/compiler/osr.sh                           | 2 +-
 test/truffle/compiler/pe.sh                            | 2 +-
 test/truffle/compiler/stf-optimises.sh                 | 2 +-
 test/truffle/compiler/tp-optimises.sh_excluded         | 2 +-
 test/truffle/integration/code-sharing-test-fast.sh     | 2 +-
 test/truffle/integration/intrument-all-nodes.sh        | 2 +-
 test/truffle/integration/limit-zero.sh                 | 2 +-
 tool/jt.rb                                             | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/truffle/compiler/clone-uninitialized-checks.sh b/test/truffle/compiler/clone-uninitialized-checks.sh
index f7ecce0cadb5..928f51ac7b93 100755
--- a/test/truffle/compiler/clone-uninitialized-checks.sh
+++ b/test/truffle/compiler/clone-uninitialized-checks.sh
@@ -5,4 +5,4 @@ source test/truffle/common.sh.inc
 export TRUFFLERUBY_CHECK_PREINITIALIZED_SPEC=false
 
 # --always-clone-all covers more than just --core-always-clone, but is much slower (6 min vs 1 min)
-JT_SPECS_COMPILATION=false JT_SPECS_SPLITTING=true jt test fast -- --core-always-clone --check-clone-uninitialized-correctness
+JT_SPECS_COMPILATION=false JT_SPECS_SPLITTING=true jt test fast -- --experimental-options --core-always-clone --check-clone-uninitialized-correctness
diff --git a/test/truffle/compiler/compile-immediately.sh b/test/truffle/compiler/compile-immediately.sh
index 3065fcd1599f..51627968bed7 100755
--- a/test/truffle/compiler/compile-immediately.sh
+++ b/test/truffle/compiler/compile-immediately.sh
@@ -6,6 +6,6 @@ code="puts 'hello'"
 
 # Test both without and with BackgroundCompilation, it catches different issues
 
-jt ruby --engine.UsePreInitializedContext=false --check-compilation --engine.CompileImmediately --engine.BackgroundCompilation=false --trace -e "$code"
+jt ruby --engine.UsePreInitializedContext=false --check-compilation --experimental-options --engine.CompileImmediately --engine.BackgroundCompilation=false --trace -e "$code"
 
-jt ruby --engine.UsePreInitializedContext=false --check-compilation --engine.CompileImmediately --trace -e "$code"
+jt ruby --engine.UsePreInitializedContext=false --check-compilation --experimental-options --engine.CompileImmediately --trace -e "$code"
diff --git a/test/truffle/compiler/optional-assignment-lazy-load.sh b/test/truffle/compiler/optional-assignment-lazy-load.sh
index 586e6786b260..cc0889961efc 100755
--- a/test/truffle/compiler/optional-assignment-lazy-load.sh
+++ b/test/truffle/compiler/optional-assignment-lazy-load.sh
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --check-compilation --engine.MultiTier=false test/truffle/compiler/optional-assignment-lazy-load/optional-assignment-lazy-load.rb
+jt ruby --check-compilation --experimental-options --engine.MultiTier=false test/truffle/compiler/optional-assignment-lazy-load/optional-assignment-lazy-load.rb
diff --git a/test/truffle/compiler/osr.sh b/test/truffle/compiler/osr.sh
index 67039af0bb27..ba9932f0495c 100755
--- a/test/truffle/compiler/osr.sh
+++ b/test/truffle/compiler/osr.sh
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --experimental-options --check-compilation test/truffle/compiler/osr/osr.rb
+jt ruby --check-compilation test/truffle/compiler/osr/osr.rb
diff --git a/test/truffle/compiler/pe.sh b/test/truffle/compiler/pe.sh
index 2ebb038d437d..64842619a6dc 100755
--- a/test/truffle/compiler/pe.sh
+++ b/test/truffle/compiler/pe.sh
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --experimental-options --check-compilation --compiler.IterativePartialEscape --engine.MultiTier=false test/truffle/compiler/pe/pe.rb "$@"
+jt ruby --check-compilation --experimental-options --compiler.IterativePartialEscape --engine.MultiTier=false test/truffle/compiler/pe/pe.rb "$@"
diff --git a/test/truffle/compiler/stf-optimises.sh b/test/truffle/compiler/stf-optimises.sh
index df61132dc160..b0259fa82d3c 100755
--- a/test/truffle/compiler/stf-optimises.sh
+++ b/test/truffle/compiler/stf-optimises.sh
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --experimental-options --check-compilation --engine.MultiTier=false test/truffle/compiler/stf-optimises/stf-optimises.rb
+jt ruby --check-compilation --experimental-options --engine.MultiTier=false test/truffle/compiler/stf-optimises/stf-optimises.rb
diff --git a/test/truffle/compiler/tp-optimises.sh_excluded b/test/truffle/compiler/tp-optimises.sh_excluded
index fea2d6a7daf7..f6fdf11a853c 100755
--- a/test/truffle/compiler/tp-optimises.sh_excluded
+++ b/test/truffle/compiler/tp-optimises.sh_excluded
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --experimental-options --check-compilation --engine.MultiTier=false test/truffle/compiler/tp-optimises/tp-optimises.rb
+jt ruby --check-compilation --experimental-options --engine.MultiTier=false test/truffle/compiler/tp-optimises/tp-optimises.rb
diff --git a/test/truffle/integration/code-sharing-test-fast.sh b/test/truffle/integration/code-sharing-test-fast.sh
index 0424157fb0d1..4ab739f8ee97 100755
--- a/test/truffle/integration/code-sharing-test-fast.sh
+++ b/test/truffle/integration/code-sharing-test-fast.sh
@@ -3,4 +3,4 @@
 source test/truffle/common.sh.inc
 
 export TRUFFLERUBY_CHECK_PREINITIALIZED_SPEC=false
-jt test fast -- --engine.ForceCodeSharing --experimental-engine-caching
+jt test fast -- --experimental-options --engine.ForceCodeSharing --experimental-engine-caching
diff --git a/test/truffle/integration/intrument-all-nodes.sh b/test/truffle/integration/intrument-all-nodes.sh
index d2ae1135854f..768634aae1c1 100755
--- a/test/truffle/integration/intrument-all-nodes.sh
+++ b/test/truffle/integration/intrument-all-nodes.sh
@@ -3,4 +3,4 @@
 source test/truffle/common.sh.inc
 
 export TRUFFLERUBY_CHECK_PREINITIALIZED_SPEC=false
-jt test fast -- --instrument-all-nodes
+jt test fast -- --experimental-options --instrument-all-nodes
diff --git a/test/truffle/integration/limit-zero.sh b/test/truffle/integration/limit-zero.sh
index 0d85c1a2e558..82133957bb03 100755
--- a/test/truffle/integration/limit-zero.sh
+++ b/test/truffle/integration/limit-zero.sh
@@ -3,4 +3,4 @@
 source test/truffle/common.sh.inc
 
 export TRUFFLERUBY_CHECK_PREINITIALIZED_SPEC=false
-jt test fast -- --default-cache=0 --identity-cache=0 --class-cache=0 --array-dup-cache=0 --array-strategy-cache=0 --pack-unroll=0 --global-variable-max-invalidations=0
+jt test fast -- --experimental-options --default-cache=0 --identity-cache=0 --class-cache=0 --array-dup-cache=0 --array-strategy-cache=0 --pack-unroll=0 --global-variable-max-invalidations=0
diff --git a/tool/jt.rb b/tool/jt.rb
index dcd14186f940..8cddbdff501d 100755
--- a/tool/jt.rb
+++ b/tool/jt.rb
@@ -1700,7 +1700,7 @@ def mspec(*args)
     vm_args, ruby_args, parsed_options = ruby_options({}, ['--reveal', *ruby_args])
 
     if !JT_SPECS_COMPILATION && truffleruby_compiler? && truffleruby_jvm?
-      vm_args << '--vm.XX:-UseJVMCICompiler' << '--engine.Compilation=false'
+      vm_args << '--vm.XX:-UseJVMCICompiler' << '--experimental-options' << '--engine.Compilation=false'
       vm_args << '--engine.Splitting=false' unless JT_SPECS_SPLITTING
     end
 

From 53953de20ccacb51c34cd613b0c877706c1de260 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Mon, 29 Jan 2024 13:51:50 +0100
Subject: [PATCH 114/131] Exclude MRI tests failing due to missing regexp
 encoding flags in Prism

* And also some string/encoding-related missing SyntaxError from Prism.
---
 test/mri/excludes/TestM17N.rb               | 8 ++++++++
 test/mri/excludes/TestMixedUnicodeEscape.rb | 1 +
 2 files changed, 9 insertions(+)
 create mode 100644 test/mri/excludes/TestMixedUnicodeEscape.rb

diff --git a/test/mri/excludes/TestM17N.rb b/test/mri/excludes/TestM17N.rb
index 767d056f2692..1c04e0bb61c2 100644
--- a/test/mri/excludes/TestM17N.rb
+++ b/test/mri/excludes/TestM17N.rb
@@ -28,3 +28,11 @@
 exclude :test_sprintf_s, "needs investigation"
 exclude :test_string_inspect_encoding, "needs investigation"
 exclude :test_utf_dummy_are_like_regular_dummy_encodings, "<[0, 0, 254, 255]> expected but was"
+exclude :test_dynamic_eucjp_regexp, "prism missing regexp encoding flags"
+exclude :test_dynamic_sjis_regexp, "prism missing regexp encoding flags"
+exclude :test_dynamic_utf8_regexp, "prism missing regexp encoding flags"
+exclude :test_regexp_mixed_unicode, "prism missing regexp encoding flags"
+exclude :test_regexp_too_short_multibyte_character, "prism missing regexp encoding flags"
+exclude :test_regexp_unicode, "prism missing regexp encoding flags"
+exclude :test_regexp_usascii, "prism missing regexp encoding flags"
+exclude :test_string_mixed_unicode, "prism missing regexp encoding flags"
diff --git a/test/mri/excludes/TestMixedUnicodeEscape.rb b/test/mri/excludes/TestMixedUnicodeEscape.rb
new file mode 100644
index 000000000000..110e59e3431c
--- /dev/null
+++ b/test/mri/excludes/TestMixedUnicodeEscape.rb
@@ -0,0 +1 @@
+exclude :test_basic, "prism missing regexp encoding flags"

From a6dc1e09034d2c072b2b15fb352dac405cc6452c Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Mon, 29 Jan 2024 14:08:26 +0100
Subject: [PATCH 115/131] Adapt MRI tests to allow Prism error messages

* And exclude on missing SyntaxError.
---
 test/mri/excludes/TestParse.rb       |  2 ++
 test/mri/excludes/TestRegexp.rb      |  2 ++
 test/mri/excludes/TestRubyLiteral.rb |  1 +
 test/mri/tests/ruby/test_class.rb    |  2 +-
 test/mri/tests/ruby/test_parse.rb    | 44 ++++++++++++++--------------
 test/mri/tests/ruby/test_require.rb  |  4 +--
 6 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/test/mri/excludes/TestParse.rb b/test/mri/excludes/TestParse.rb
index 304f3b4a6ad9..70f781b2ade4 100644
--- a/test/mri/excludes/TestParse.rb
+++ b/test/mri/excludes/TestParse.rb
@@ -50,3 +50,5 @@
 exclude :test_magic_comment, "<#> expected but was"
 exclude :test_if_after_class, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_parse.rb:1365:in `test_if_after_class'."
 exclude :test_escaped_space, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_parse.rb:1370:in `test_escaped_space'."
+exclude :test_dynamic_constant_assignment, "prism"
+exclude :test_serial_comparison, "prism"
diff --git a/test/mri/excludes/TestRegexp.rb b/test/mri/excludes/TestRegexp.rb
index 34669538e14d..3de09ac0d9c1 100644
--- a/test/mri/excludes/TestRegexp.rb
+++ b/test/mri/excludes/TestRegexp.rb
@@ -50,3 +50,5 @@
 exclude :test_s_timeout_corner_cases, "NoMethodError: private method `timeout' called for Regexp:Class"
 exclude :test_bug_19467, "NoMethodError: undefined method `timeout=' for Regexp:Class"
 exclude :test_s_timeout, "NoMethodError: undefined method `timeout=' for Regexp:Class"
+exclude :test_unicode, "prism missing regexp encoding flags"
+exclude :test_char_class, "prism missing regexp encoding flags"
diff --git a/test/mri/excludes/TestRubyLiteral.rb b/test/mri/excludes/TestRubyLiteral.rb
index 75381c044c29..356fd668fc73 100644
--- a/test/mri/excludes/TestRubyLiteral.rb
+++ b/test/mri/excludes/TestRubyLiteral.rb
@@ -3,3 +3,4 @@
 exclude :test_hash_value_omission, "NameError: undefined local variable or method `FOO' for #"
 exclude :test_hash_duplicated_key, "duplicated literal key."
 exclude :test_float, "_1 inside eval, see https://github.com/ruby/prism/issues/2275"
+exclude :test_dregexp, "prism missing regexp encoding flags"
diff --git a/test/mri/tests/ruby/test_class.rb b/test/mri/tests/ruby/test_class.rb
index 5086e60398ec..2fd7a63c4f21 100644
--- a/test/mri/tests/ruby/test_class.rb
+++ b/test/mri/tests/ruby/test_class.rb
@@ -308,7 +308,7 @@ def test_invalid_retry_from_class_definition
   end
 
   def test_invalid_return_from_class_definition
-    assert_syntax_error("class C; return; end", /Invalid return/)
+    assert_syntax_error("class C; return; end", /Invalid return|invalid `return`/)
   end
 
   def test_invalid_yield_from_class_definition
diff --git a/test/mri/tests/ruby/test_parse.rb b/test/mri/tests/ruby/test_parse.rb
index 4488ea620ef8..425369cddcea 100644
--- a/test/mri/tests/ruby/test_parse.rb
+++ b/test/mri/tests/ruby/test_parse.rb
@@ -26,7 +26,7 @@ def test_else_without_rescue
   end
 
   def test_alias_backref
-    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /can't make alias/) do
+    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /can't make alias|invalid argument being passed to `alias`/) do
       begin;
         alias $foo $1
       end;
@@ -84,7 +84,7 @@ class << o
     assert_equal([42, 42], [o.Foo, o.Bar])
     assert_equal([42, 42], [o::baz, o::qux])
 
-    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /Can't set variable/) do
+    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /Can't set variable|immutable variable as a write target/) do
       begin;
         $1 ||= t.foo 42
       end;
@@ -192,13 +192,13 @@ def foo
   end
 
   def test_class_module
-    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /must be CONSTANT/) do
+    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /must be CONSTANT|expected a constant name/) do
       begin;
         class foo; end
       end;
     end
 
-    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /in method body/) do
+    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /in method body|unexpected class definition in a method definition/) do
       begin;
         def foo
           class Foo; end
@@ -294,7 +294,7 @@ def foo(@@foo); end
       end;
     end
 
-    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /cannot be an instance variable/) do
+    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /cannot be an instance variable|expected a local variable name in the block parameters/) do
       begin;
         o.foo {|; @a| @a = 42 }
       end;
@@ -377,10 +377,10 @@ def test_dsym
 
   def assert_disallowed_variable(type, noname, invalid)
     noname.each do |name|
-      assert_syntax_error("proc{a = #{name} }", "`#{noname[0]}' without identifiers is not allowed as #{type} variable name")
+      assert_syntax_error("proc{a = #{name} }", /`#{noname[0]}' without identifiers is not allowed as #{type} variable name|invalid global variable/)
     end
     invalid.each do |name|
-      assert_syntax_error("proc {a = #{name} }", "`#{name}' is not allowed as #{type} variable name")
+      assert_syntax_error("proc {a = #{name} }", /`#{name}' is not allowed as #{type} variable name|invalid global variable/)
     end
   end
 
@@ -438,13 +438,13 @@ def test_duplicate_argument
       end;
     end
 
-    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /duplicated argument/) do
+    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /duplicated argument|repeated parameter name/) do
       begin;
         1.times {|a, a|}
       end;
     end
 
-    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /duplicated argument/) do
+    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /duplicated argument|repeated parameter name/) do
       begin;
         def foo(a, a); end
       end;
@@ -611,12 +611,12 @@ def test_question
 
   def test_percent
     assert_equal(:foo, eval('%s(foo)'))
-    assert_syntax_error('%s', /unterminated quoted string/)
-    assert_syntax_error('%ss', /unknown type/)
-    assert_syntax_error('%z()', /unknown type/)
-    assert_syntax_error("%\u3042", /unknown type/)
-    assert_syntax_error("%q\u3042", /unknown type/)
-    assert_syntax_error("%", /unterminated quoted string/)
+    assert_syntax_error('%s', /unterminated quoted string|expected a closing delimiter for the dynamic symbol/)
+    assert_syntax_error('%ss', /unknown type|invalid `%` token/)
+    assert_syntax_error('%z()', /unknown type|invalid `%` token/)
+    assert_syntax_error("%\u3042", /unknown type|invalid `%` token/)
+    assert_syntax_error("%q\u3042", /unknown type|invalid `%` token/)
+    assert_syntax_error("%", /unterminated quoted string|invalid `%` token/)
   end
 
   def test_symbol
@@ -643,7 +643,7 @@ def test_symbol
   end
 
   def test_parse_string
-    assert_syntax_error("/\n", /unterminated/)
+    assert_syntax_error("/\n", /unterminated|expected a closing delimiter for the regular expression/)
   end
 
   def test_here_document
@@ -817,7 +817,7 @@ def test_block_dup
   end
 
   def test_set_backref
-    assert_syntax_error("$& = 1", /Can't set variable/)
+    assert_syntax_error("$& = 1", /Can't set variable|immutable variable as a write target/)
   end
 
   def test_arg_concat
@@ -1111,7 +1111,7 @@ def test_heredoc_interpolation
     end
 
   def test_unexpected_token_error
-    assert_syntax_error('"x"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx', /unexpected/)
+    assert_syntax_error('"x"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx', /unexpected|expected a newline or semicolon after the statement/)
   end
 
   def test_unexpected_token_after_numeric
@@ -1129,7 +1129,7 @@ def test_truncated_source_line
   end
 
   def test_unterminated_regexp_error
-    e = assert_syntax_error("/x", /unterminated regexp meets end of file/)
+    e = assert_syntax_error("/x", /unterminated regexp meets end of file|expected a closing delimiter for the regular expression/)
     assert_not_match(/unexpected tSTRING_END/, e.message)
   end
 
@@ -1161,9 +1161,9 @@ def test_eof
   end
 
   def test_eof_in_def
-    assert_syntax_error("def m\n\0""end", /unexpected/)
-    assert_syntax_error("def m\n\C-d""end", /unexpected/)
-    assert_syntax_error("def m\n\C-z""end", /unexpected/)
+    assert_syntax_error("def m\n\0""end", /unexpected|cannot parse the expression/)
+    assert_syntax_error("def m\n\C-d""end", /unexpected|cannot parse the expression/)
+    assert_syntax_error("def m\n\C-z""end", /unexpected|cannot parse the expression/)
   end
 
   def test_unexpected_eof
diff --git a/test/mri/tests/ruby/test_require.rb b/test/mri/tests/ruby/test_require.rb
index e0cfc8c9140f..c64c400243e2 100644
--- a/test/mri/tests/ruby/test_require.rb
+++ b/test/mri/tests/ruby/test_require.rb
@@ -204,7 +204,7 @@ def assert_syntax_error_backtrace
     Dir.mktmpdir do |tmp|
       req = File.join(tmp, "test.rb")
       File.write(req, ",\n")
-      e = assert_raise_with_message(SyntaxError, /unexpected/) {
+      e = assert_raise_with_message(SyntaxError, /unexpected|cannot parse the expression/) {
         yield req
       }
       assert_not_nil(bt = e.backtrace, "no backtrace")
@@ -219,7 +219,7 @@ def test_require_syntax_error
 
   def test_require_syntax_error_rescued
     assert_syntax_error_backtrace do |req|
-      assert_raise_with_message(SyntaxError, /unexpected/) {require req}
+      assert_raise_with_message(SyntaxError, /unexpected|cannot parse the expression/) {require req}
       require req
     end
   end

From 6769f95732463e8e5f89ad95814b2fe8afe59144 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Mon, 29 Jan 2024 14:23:45 +0100
Subject: [PATCH 116/131] Workaround https://github.com/ruby/prism/issues/2289

---
 test/mri/tests/ruby/test_process.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/mri/tests/ruby/test_process.rb b/test/mri/tests/ruby/test_process.rb
index 1d04d22631b9..4d01d3eda39e 100644
--- a/test/mri/tests/ruby/test_process.rb
+++ b/test/mri/tests/ruby/test_process.rb
@@ -1823,7 +1823,12 @@ def test_system_sigpipe
       end
     end
   ensure
-    Process.kill(:KILL, pid) if (pid != 0) rescue false
+    # https://github.com/ruby/prism/issues/2289
+    # Process.kill(:KILL, pid) if (pid != 0) rescue false
+    begin
+      Process.kill(:KILL, pid) if (pid != 0)
+    rescue Errno::ESRCH
+    end
   end
 
   if Process.respond_to?(:daemon)

From cd64acba99b486e32a209d33baeab5fcd5893490 Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Mon, 29 Jan 2024 16:14:00 +0200
Subject: [PATCH 117/131] Make a helper method ArrayUtils.getLast generic and
 use it for translators

---
 src/main/java/org/truffleruby/core/array/ArrayUtils.java | 2 +-
 .../org/truffleruby/language/dispatch/RubyCallNode.java  | 9 +++++----
 .../java/org/truffleruby/parser/YARPBaseTranslator.java  | 3 ++-
 src/main/java/org/truffleruby/parser/YARPTranslator.java | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/truffleruby/core/array/ArrayUtils.java b/src/main/java/org/truffleruby/core/array/ArrayUtils.java
index 6c468d2ca441..0b4ead5a0623 100644
--- a/src/main/java/org/truffleruby/core/array/ArrayUtils.java
+++ b/src/main/java/org/truffleruby/core/array/ArrayUtils.java
@@ -242,7 +242,7 @@ public static Object[] append(Object[] array, Object element) {
         return newArray;
     }
 
-    public static Object getLast(Object[] array) {
+    public static  T getLast(T[] array) {
         assert array.length >= 1;
         return array[array.length - 1];
     }
diff --git a/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java b/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java
index f98006368d2b..7e9b7b594b9d 100644
--- a/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java
+++ b/src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java
@@ -19,6 +19,7 @@
 import org.truffleruby.core.array.ArrayAppendOneNode;
 import org.truffleruby.core.array.ArrayConcatNode;
 import org.truffleruby.core.array.ArrayLiteralNode;
+import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.core.array.AssignableNode;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.cast.BooleanCastNode;
@@ -184,7 +185,7 @@ public Object doCall(VirtualFrame frame, Object receiverObject, ArgumentsDescrip
 
         final Object returnValue = dispatch.execute(frame, receiverObject, methodName, rubyArgs, dispatchConfig);
         if (isAttrAssign) {
-            final Object value = rubyArgs[rubyArgs.length - 1];
+            final Object value = ArrayUtils.getLast(rubyArgs);
             assert RubyGuards.assertIsValidRubyValue(value);
             return value;
         } else {
@@ -279,7 +280,7 @@ public RubyNode[] getArguments() {
     }
 
     private RubyNode getLastArgumentNode() {
-        final RubyNode lastArg = RubyNode.unwrapNode(arguments[arguments.length - 1]);
+        final RubyNode lastArg = RubyNode.unwrapNode(ArrayUtils.getLast(arguments));
 
         // BodyTranslator-specific condition
         if (isSplatted && lastArg instanceof ArrayAppendOneNode arrayAppendOneNode) {
@@ -294,13 +295,13 @@ private RubyNode getLastArgumentNode() {
             RubyNode[] elements = arrayConcatNode.getElements();
             assert elements.length > 0;
 
-            RubyNode last = RubyNode.unwrapNode(elements[elements.length - 1]);
+            RubyNode last = RubyNode.unwrapNode(ArrayUtils.getLast(elements));
 
             if (last instanceof ArrayLiteralNode arrayLiteralNode) {
                 RubyNode[] values = arrayLiteralNode.getValues();
                 assert values.length > 0;
 
-                return RubyNode.unwrapNode(values[values.length - 1]);
+                return RubyNode.unwrapNode(ArrayUtils.getLast(values));
             } else {
                 return last;
             }
diff --git a/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
index 1b716435f38a..3d292c05d368 100644
--- a/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPBaseTranslator.java
@@ -17,6 +17,7 @@
 import org.prism.Nodes;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.DummyNode;
+import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.encoding.TStringUtils;
 import org.truffleruby.language.RubyContextSourceNode;
@@ -179,7 +180,7 @@ protected static void assignPositionOnly(Nodes.Node yarpNode, RubyNode rubyNode)
     // assign position based on a list of nodes (arguments list, exception classes list in a rescue section, etc)
     protected final void assignPositionOnly(Nodes.Node[] nodes, RubyNode rubyNode) {
         final Nodes.Node first = nodes[0];
-        final Nodes.Node last = nodes[nodes.length - 1];
+        final Nodes.Node last = ArrayUtils.getLast(nodes);
 
         final int length = last.endOffset() - first.startOffset;
         rubyNode.unsafeSetSourceSection(first.startOffset, length);
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index 2225a7014cda..3d94c698147a 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -771,7 +771,7 @@ private ArgumentsDescriptor getKeywordArgumentsDescriptor(Nodes.Node[] arguments
         }
 
         // consider there are keyword arguments if the last argument is either ... or a Hash
-        Nodes.Node last = arguments[arguments.length - 1];
+        Nodes.Node last = ArrayUtils.getLast(arguments);
 
         // a(...) means there are potentially forwarded keyword arguments
         if (last instanceof Nodes.ForwardingArgumentsNode) {
@@ -2400,7 +2400,7 @@ private static Nodes.StringNode concatStringNodes(Nodes.InterpolatedStringNode n
         }
 
         int start = parts[0].startOffset;
-        var last = parts[parts.length - 1];
+        var last = ArrayUtils.getLast(parts);
         int length = last.endOffset() - start;
         return new Nodes.StringNode(NO_FLAGS, concatenated, start, length);
     }

From d6465e9644da83d0befdad740b307fe261108197 Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Mon, 29 Jan 2024 16:51:18 +0200
Subject: [PATCH 118/131] Add enum for Prism syntax versions

---
 .../parser/YARPTranslatorDriver.java          |  4 +---
 src/yarp/java/org/prism/ParsingOptions.java   | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index dbfbfcccfc75..5c962aaa9de5 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -421,9 +421,7 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
         byte[] encoding = StringOperations.encodeAsciiBytes(rubySource.getEncoding().toString()); // encoding name is supposed to contain only ASCII characters
         boolean frozenStringLiteral = language.options.FROZEN_STRING_LITERALS;
         boolean verbose = true;
-        // The vendored version of prism in CRuby 3.3.0
-        // See pm_options_version_t in c/yarp/include/prism/options.h
-        byte version = (byte) 1;
+        var version = ParsingOptions.SyntaxVersion.V3_3_0;
         byte[][][] scopes;
 
         // intern() to improve footprint
diff --git a/src/yarp/java/org/prism/ParsingOptions.java b/src/yarp/java/org/prism/ParsingOptions.java
index ab82b6591c8a..c5a101bf8977 100644
--- a/src/yarp/java/org/prism/ParsingOptions.java
+++ b/src/yarp/java/org/prism/ParsingOptions.java
@@ -6,6 +6,23 @@
 
 // @formatter:off
 public abstract class ParsingOptions {
+    /** The version of Ruby syntax that we should be parsing with.
+     * See pm_options_version_t in c/yarp/include/prism/options.h */
+    public enum SyntaxVersion {
+        LATEST(0),
+        V3_3_0(1);
+
+        private final int value;
+
+        SyntaxVersion(int value) {
+            this.value = value;
+        }
+
+        public byte getValue() {
+            return (byte) value;
+        }
+    }
+
     /** Serialize parsing options into byte array.
      *
      * @param filepath the name of the file that is currently being parsed
@@ -17,7 +34,7 @@ public abstract class ParsingOptions {
      * @param scopes scopes surrounding the code that is being parsed with local variable names defined in every scope
      *            ordered from the outermost scope to the innermost one */
     public static byte[] serialize(byte[] filepath, int line, byte[] encoding, boolean frozenStringLiteral,
-            boolean verbose, byte version, byte[][][] scopes) {
+            boolean verbose, SyntaxVersion version, byte[][][] scopes) {
         final ByteArrayOutputStream output = new ByteArrayOutputStream();
 
         // filepath
@@ -47,7 +64,7 @@ public static byte[] serialize(byte[] filepath, int line, byte[] encoding, boole
         }
 
         // version
-        output.write(version);
+        output.write(version.getValue());
 
         // scopes
 

From 98798eb92a4ba5602a9239ab23ed76df64743924 Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Mon, 29 Jan 2024 17:00:57 +0200
Subject: [PATCH 119/131] Use CompilerDirectives.shouldNotReachHere instead of
 IllegalStateException

---
 .../org/truffleruby/parser/YARPLoadArgumentsTranslator.java   | 4 ++--
 .../parser/YARPParametersNodeToDestructureTranslator.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
index 20915434c219..4b2cf459e54d 100644
--- a/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java
@@ -158,7 +158,7 @@ public RubyNode visitMultiTargetNode(Nodes.MultiTargetNode node) {
             readNode = new ReadPostArgumentNode(-index, getRequiredCount(), getOptionalCount(), hasRest(),
                     hasKeywordArguments());
         } else {
-            throw new IllegalStateException();
+            throw CompilerDirectives.shouldNotReachHere();
         }
 
         final var translator = new YARPMultiTargetNodeTranslator(node, language, yarpTranslator, readNode);
@@ -191,7 +191,7 @@ public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) {
             readNode = new ReadPostArgumentNode(-index, getRequiredCount(), getOptionalCount(), hasRest(),
                     hasKeywordArguments());
         } else {
-            throw new IllegalStateException();
+            throw CompilerDirectives.shouldNotReachHere();
         }
 
         final int slot;
diff --git a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java
index 3df360c5f9f8..ca90a994636b 100644
--- a/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPParametersNodeToDestructureTranslator.java
@@ -134,7 +134,7 @@ public RubyNode visitMultiTargetNode(Nodes.MultiTargetNode node) {
             readNode = new ReadBlockPostArgumentFromArrayNode(readArrayNode, -index, getRequiredCount(),
                     getOptionalCount(), hasRest());
         } else {
-            throw new IllegalStateException();
+            throw CompilerDirectives.shouldNotReachHere();
         }
 
         final var translator = new YARPMultiTargetNodeTranslator(node, language, yarpTranslator, readNode);
@@ -161,7 +161,7 @@ public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) {
             readNode = new ReadBlockPostArgumentFromArrayNode(readArrayNode, -index, getRequiredCount(),
                     getOptionalCount(), hasRest());
         } else {
-            throw new IllegalStateException();
+            throw CompilerDirectives.shouldNotReachHere();
         }
 
         final int slot = environment.findFrameSlot(node.name);

From 56a3aea384d315fa2bb257218c0606ede6a626f3 Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Mon, 29 Jan 2024 17:48:15 +0200
Subject: [PATCH 120/131] Remove redundant check in handling rescue operator

---
 src/main/java/org/truffleruby/parser/YARPTranslator.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index 3d94c698147a..77f8b4d629f3 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -290,11 +290,6 @@ public RubyNode visitBackReferenceReadNode(Nodes.BackReferenceReadNode node) {
     public RubyNode visitBeginNode(Nodes.BeginNode node) {
         RubyNode rubyNode;
 
-        // empty begin/end block - so ignore possibly present rescue and else branches
-        if (node.statements == null && node.ensure_clause == null) {
-            return new NilLiteralNode();
-        }
-
         if (node.statements != null) {
             rubyNode = node.statements.accept(this);
         } else {
@@ -303,6 +298,7 @@ public RubyNode visitBeginNode(Nodes.BeginNode node) {
 
         // fast path
         if (node.rescue_clause == null && node.ensure_clause == null) {
+            assert node.else_clause == null;
             return rubyNode;
         }
 

From 12cd32b475a616acd97e54f9093532b6cd99dc7f Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Mon, 29 Jan 2024 20:07:26 +0200
Subject: [PATCH 121/131] Use OrLazyValueDefinedNode instead of OrNode for
 fully qualified constants, attribute and reference optional assignment

---
 .../fixtures/operators/||=/attribute_assignment.yaml       | 3 ++-
 .../attribute_assignment_with_explicit_self_receiver.yaml  | 3 ++-
 ...attribute_assignment_with_safe_navigation_operator.yaml | 3 ++-
 .../fixtures/operators/||=/reference_assignment.yaml       | 3 ++-
 .../||=/reference_assignment_with_block_argument.yaml      | 3 ++-
 .../reference_assignment_with_explicit_self_receiver.yaml  | 3 ++-
 .../||=/reference_assignment_with_multiple_indexes.yaml    | 3 ++-
 ...reference_assignment_with_nested_splatted_argument.yaml | 3 ++-
 .../||=/reference_assignment_with_splatted_argument.yaml   | 3 ++-
 .../||=/variable_assignments/constant_fully_qualified.yaml | 3 ++-
 src/main/java/org/truffleruby/parser/YARPTranslator.java   | 7 +++----
 11 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment.yaml b/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment.yaml
index 0ea3fb149e09..c8b8166809b2 100644
--- a/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment.yaml
+++ b/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment.yaml
@@ -47,9 +47,10 @@ ast: |
                                                   SelfNode
                                                       attributes:
                                                           flags = 0
-                          OrNodeGen
+                          OrLazyValueDefinedNodeGen
                               attributes:
                                   flags = 0
+                                  rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                               children:
                                   left =
                                       RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_explicit_self_receiver.yaml b/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_explicit_self_receiver.yaml
index 0f4521cbd1d0..48b04fbb8843 100644
--- a/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_explicit_self_receiver.yaml
+++ b/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_explicit_self_receiver.yaml
@@ -15,9 +15,10 @@ ast: |
           flags = 1
       children:
           child =
-              OrNodeGen
+              OrLazyValueDefinedNodeGen
                   attributes:
                       flags = 0
+                      rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                   children:
                       left =
                           RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_safe_navigation_operator.yaml b/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_safe_navigation_operator.yaml
index 1d13ca3ebabd..e9cf72a4dee6 100644
--- a/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_safe_navigation_operator.yaml
+++ b/spec/truffle/parsing/fixtures/operators/||=/attribute_assignment_with_safe_navigation_operator.yaml
@@ -73,9 +73,10 @@ ast: |
                                                           frameSlot = 2 # %value_0
                                                           type = FRAME_LOCAL
                                   thenBody =
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment.yaml
index d1827d1fd80a..ba0e8ec889a6 100644
--- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment.yaml
+++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment.yaml
@@ -78,9 +78,10 @@ ast: |
                                                               SelfNode
                                                                   attributes:
                                                                       flags = 0
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   InlinedIndexGetNodeGen
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_block_argument.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_block_argument.yaml
index e346fbce3f5f..4631ba3eaa96 100644
--- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_block_argument.yaml
+++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_block_argument.yaml
@@ -103,9 +103,10 @@ ast: |
                                                               SelfNode
                                                                   attributes:
                                                                       flags = 0
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_explicit_self_receiver.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_explicit_self_receiver.yaml
index ee8ccedd4c0a..1d4beceaaf42 100644
--- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_explicit_self_receiver.yaml
+++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_explicit_self_receiver.yaml
@@ -49,9 +49,10 @@ ast: |
                                                       attributes:
                                                           flags = 0
                                                           value = 42
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   InlinedIndexGetNodeGen
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_multiple_indexes.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_multiple_indexes.yaml
index cd277615aed4..bf4f29396bc5 100644
--- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_multiple_indexes.yaml
+++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_multiple_indexes.yaml
@@ -91,9 +91,10 @@ ast: |
                                                               SelfNode
                                                                   attributes:
                                                                       flags = 0
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml
index a14dc2c3f0bc..18ad0732341e 100644
--- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml
+++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_nested_splatted_argument.yaml
@@ -96,9 +96,10 @@ ast: |
                                                               SelfNode
                                                                   attributes:
                                                                       flags = 0
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_splatted_argument.yaml b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_splatted_argument.yaml
index 86ac089ff371..a2479ddecead 100644
--- a/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_splatted_argument.yaml
+++ b/spec/truffle/parsing/fixtures/operators/||=/reference_assignment_with_splatted_argument.yaml
@@ -95,9 +95,10 @@ ast: |
                                                               SelfNode
                                                                   attributes:
                                                                       flags = 0
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/operators/||=/variable_assignments/constant_fully_qualified.yaml b/spec/truffle/parsing/fixtures/operators/||=/variable_assignments/constant_fully_qualified.yaml
index c5255aa72179..a6c8934cd599 100644
--- a/spec/truffle/parsing/fixtures/operators/||=/variable_assignments/constant_fully_qualified.yaml
+++ b/spec/truffle/parsing/fixtures/operators/||=/variable_assignments/constant_fully_qualified.yaml
@@ -56,9 +56,10 @@ ast: |
                                                                   attributes:
                                                                       lexicalScope =  :: Object
                                                                       name = "FOO"
-                                      OrNodeGen
+                                      OrLazyValueDefinedNodeGen
                                           attributes:
                                               flags = 0
+                                              rightTwiceProfile = org.truffleruby.utils.RunTwiceBranchProfile@...
                                           children:
                                               left =
                                                   AndNodeGen
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index 77f8b4d629f3..5886edd690af 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -861,7 +861,7 @@ public RubyNode visitCallOrWriteNode(Nodes.CallOrWriteNode node) {
                 .accept(this);
         final RubyNode writeNode = callNode(node, writeFlags, readReceiver, node.write_name,
                 node.value).accept(this);
-        final RubyNode orNode = OrNodeGen.create(readNode, writeNode);
+        final RubyNode orNode = OrLazyValueDefinedNodeGen.create(readNode, writeNode);
 
         final RubyNode sequence;
         if (node.isSafeNavigation()) {
@@ -1146,7 +1146,6 @@ public RubyNode visitClassVariableOrWriteNode(Nodes.ClassVariableOrWriteNode nod
         var readNode = new Nodes.ClassVariableReadNode(node.name, startOffset, length).accept(this);
         var andNode = AndNodeGen.create(new DefinedNode(readNode), readNode);
 
-        // TODO: should be used for every ||= node (class variable/etc)?
         final RubyNode rubyNode = OrLazyValueDefinedNodeGen.create(andNode, writeNode);
         return assignPositionAndFlags(node, rubyNode);
     }
@@ -1366,7 +1365,7 @@ public RubyNode visitConstantPathOrWriteNode(Nodes.ConstantPathOrWriteNode node)
         var readNode = (ReadConstantNode) target.accept(this);
         var writeNode = (WriteConstantNode) readNode.makeWriteNode(value);
         var andNode = AndNodeGen.create(new DefinedNode(readNode), readNode);
-        final RubyNode orNode = OrNodeGen.create(andNode, writeNode);
+        final RubyNode orNode = OrLazyValueDefinedNodeGen.create(andNode, writeNode);
 
         final RubyNode rubyNode;
 
@@ -2190,7 +2189,7 @@ private RubyNode translateIndexOrAndIndexAndWriteNodes(boolean isAndOperator, No
         if (isAndOperator) {
             operatorNode = AndNodeGen.create(readNode, writeNode);
         } else {
-            operatorNode = OrNodeGen.create(readNode, writeNode);
+            operatorNode = OrLazyValueDefinedNodeGen.create(readNode, writeNode);
         }
 
         final RubyNode writeArgumentsNode = sequence(Arrays.asList(writeArgumentsNodes));

From bf4a4d0be3231942bfccd515cd1753050b3db9ad Mon Sep 17 00:00:00 2001
From: Andrew Konchin 
Date: Mon, 29 Jan 2024 21:01:29 +0200
Subject: [PATCH 122/131] Remove leading empty string literal node in
 InterpolatedRegexpNode that represents encoding either forced or specified
 with flag

---
 ...in_boolean_context_with_interpolation.yaml | 10 ++------
 .../regexps/with_embedded_class_variable.yaml | 10 ++------
 .../with_embedded_global_variable.yaml        | 10 ++------
 .../with_embedded_instance_variable.yaml      | 10 ++------
 .../fixtures/regexps/with_interpolation.yaml  | 10 ++------
 ...with_interpolation_without_expression.yaml | 10 ++------
 .../core/regexp/InterpolatedRegexpNode.java   | 24 ++++++++++++++-----
 .../truffleruby/parser/BodyTranslator.java    |  1 +
 .../truffleruby/parser/YARPTranslator.java    | 16 ++++---------
 9 files changed, 35 insertions(+), 66 deletions(-)

diff --git a/spec/truffle/parsing/fixtures/regexps/in_boolean_context_with_interpolation.yaml b/spec/truffle/parsing/fixtures/regexps/in_boolean_context_with_interpolation.yaml
index 077ba3e5434f..b3218a57c3ef 100644
--- a/spec/truffle/parsing/fixtures/regexps/in_boolean_context_with_interpolation.yaml
+++ b/spec/truffle/parsing/fixtures/regexps/in_boolean_context_with_interpolation.yaml
@@ -41,6 +41,7 @@ ast: |
           receiver =
               InterpolatedRegexpNode
                   attributes:
+                      encoding = ASCII-8BIT
                       flags = 0
                       rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@...
                   children:
@@ -49,19 +50,12 @@ ast: |
                       builderNode =
                           InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen
                               attributes:
+                                  encoding = ASCII-8BIT
                                   options = RegexpOptions(kcode: NONE, kcodeDefault, literal)
                               children:
                                   equalNode =
                                       TruffleStringFactory$EqualNodeGen
                       children = [
-                          ToSNodeGen
-                              children:
-                                  valueNode_ =
-                                      StringLiteralNode
-                                          attributes:
-                                              encoding = ASCII-8BIT
-                                              flags = 0
-                                              tstring = ""
                           ToSNodeGen
                               children:
                                   valueNode_ =
diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml
index 28365e34ef3e..3a9eae32decb 100644
--- a/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml
+++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_class_variable.yaml
@@ -7,6 +7,7 @@ ruby: |
 ast: |
   InterpolatedRegexpNode
       attributes:
+          encoding = ASCII-8BIT
           flags = 0
           rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@...
       children:
@@ -15,19 +16,12 @@ ast: |
           builderNode =
               InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen
                   attributes:
+                      encoding = ASCII-8BIT
                       options = RegexpOptions(kcode: NONE, kcodeDefault, literal)
                   children:
                       equalNode =
                           TruffleStringFactory$EqualNodeGen
           children = [
-              ToSNodeGen
-                  children:
-                      valueNode_ =
-                          StringLiteralNode
-                              attributes:
-                                  encoding = ASCII-8BIT
-                                  flags = 0
-                                  tstring = ""
               ToSNodeGen
                   children:
                       valueNode_ =
diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml
index 314c24fff2fa..fe73875ef576 100644
--- a/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml
+++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_global_variable.yaml
@@ -7,6 +7,7 @@ ruby: |
 ast: |
   InterpolatedRegexpNode
       attributes:
+          encoding = ASCII-8BIT
           flags = 0
           rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@...
       children:
@@ -15,19 +16,12 @@ ast: |
           builderNode =
               InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen
                   attributes:
+                      encoding = ASCII-8BIT
                       options = RegexpOptions(kcode: NONE, kcodeDefault, literal)
                   children:
                       equalNode =
                           TruffleStringFactory$EqualNodeGen
           children = [
-              ToSNodeGen
-                  children:
-                      valueNode_ =
-                          StringLiteralNode
-                              attributes:
-                                  encoding = ASCII-8BIT
-                                  flags = 0
-                                  tstring = ""
               ToSNodeGen
                   children:
                       valueNode_ =
diff --git a/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml b/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml
index 88fce6ae23df..65c529955187 100644
--- a/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml
+++ b/spec/truffle/parsing/fixtures/regexps/with_embedded_instance_variable.yaml
@@ -7,6 +7,7 @@ ruby: |
 ast: |
   InterpolatedRegexpNode
       attributes:
+          encoding = ASCII-8BIT
           flags = 0
           rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@...
       children:
@@ -15,19 +16,12 @@ ast: |
           builderNode =
               InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen
                   attributes:
+                      encoding = ASCII-8BIT
                       options = RegexpOptions(kcode: NONE, kcodeDefault, literal)
                   children:
                       equalNode =
                           TruffleStringFactory$EqualNodeGen
           children = [
-              ToSNodeGen
-                  children:
-                      valueNode_ =
-                          StringLiteralNode
-                              attributes:
-                                  encoding = ASCII-8BIT
-                                  flags = 0
-                                  tstring = ""
               ToSNodeGen
                   children:
                       valueNode_ =
diff --git a/spec/truffle/parsing/fixtures/regexps/with_interpolation.yaml b/spec/truffle/parsing/fixtures/regexps/with_interpolation.yaml
index a10d78899c4d..66423087616b 100644
--- a/spec/truffle/parsing/fixtures/regexps/with_interpolation.yaml
+++ b/spec/truffle/parsing/fixtures/regexps/with_interpolation.yaml
@@ -7,6 +7,7 @@ ruby: |
 ast: |
   InterpolatedRegexpNode
       attributes:
+          encoding = ASCII-8BIT
           flags = 0
           rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@...
       children:
@@ -15,19 +16,12 @@ ast: |
           builderNode =
               InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen
                   attributes:
+                      encoding = ASCII-8BIT
                       options = RegexpOptions(kcode: NONE, kcodeDefault, literal)
                   children:
                       equalNode =
                           TruffleStringFactory$EqualNodeGen
           children = [
-              ToSNodeGen
-                  children:
-                      valueNode_ =
-                          StringLiteralNode
-                              attributes:
-                                  encoding = ASCII-8BIT
-                                  flags = 0
-                                  tstring = ""
               ToSNodeGen
                   children:
                       valueNode_ =
diff --git a/spec/truffle/parsing/fixtures/regexps/with_interpolation_without_expression.yaml b/spec/truffle/parsing/fixtures/regexps/with_interpolation_without_expression.yaml
index 571b28fe1e30..3314bc7261c8 100644
--- a/spec/truffle/parsing/fixtures/regexps/with_interpolation_without_expression.yaml
+++ b/spec/truffle/parsing/fixtures/regexps/with_interpolation_without_expression.yaml
@@ -10,6 +10,7 @@ ruby: |
 ast: |
   InterpolatedRegexpNode
       attributes:
+          encoding = ASCII-8BIT
           flags = 0
           rubyStringLibrary = org.truffleruby.language.library.RubyStringLibrary$Cached@...
       children:
@@ -18,19 +19,12 @@ ast: |
           builderNode =
               InterpolatedRegexpNodeFactory$RegexpBuilderNodeGen
                   attributes:
+                      encoding = ASCII-8BIT
                       options = RegexpOptions(kcode: NONE, kcodeDefault, literal)
                   children:
                       equalNode =
                           TruffleStringFactory$EqualNodeGen
           children = [
-              ToSNodeGen
-                  children:
-                      valueNode_ =
-                          StringLiteralNode
-                              attributes:
-                                  encoding = ASCII-8BIT
-                                  flags = 0
-                                  tstring = ""
               ToSNodeGen
                   children:
                       valueNode_ =
diff --git a/src/main/java/org/truffleruby/core/regexp/InterpolatedRegexpNode.java b/src/main/java/org/truffleruby/core/regexp/InterpolatedRegexpNode.java
index 9710bf459030..a1791ef43620 100644
--- a/src/main/java/org/truffleruby/core/regexp/InterpolatedRegexpNode.java
+++ b/src/main/java/org/truffleruby/core/regexp/InterpolatedRegexpNode.java
@@ -12,6 +12,7 @@
 import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.api.strings.TruffleString.AsTruffleStringNode;
 import org.truffleruby.core.cast.ToSNode;
+import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.regexp.InterpolatedRegexpNodeFactory.RegexpBuilderNodeGen;
 import org.truffleruby.core.string.TStringWithEncoding;
 import org.truffleruby.language.NotOptimizedWarningNode;
@@ -33,10 +34,13 @@ public final class InterpolatedRegexpNode extends RubyContextSourceNode {
     @Child private RegexpBuilderNode builderNode;
     private final RubyStringLibrary rubyStringLibrary = RubyStringLibrary.create();
     @Child private AsTruffleStringNode asTruffleStringNode = AsTruffleStringNode.create();
+    /** initial encoding to start encodings negotiation */
+    private final RubyEncoding encoding;
 
-    public InterpolatedRegexpNode(ToSNode[] children, RegexpOptions options) {
+    public InterpolatedRegexpNode(ToSNode[] children, RubyEncoding encoding, RegexpOptions options) {
         this.children = children;
-        this.builderNode = RegexpBuilderNode.create(options);
+        this.encoding = encoding;
+        this.builderNode = RegexpBuilderNode.create(encoding, options);
     }
 
     @Override
@@ -60,6 +64,7 @@ protected TStringWithEncoding[] executeChildren(VirtualFrame frame) {
     public RubyNode cloneUninitialized() {
         var copy = new InterpolatedRegexpNode(
                 cloneUninitialized(children),
+                encoding,
                 builderNode.options);
         return copy.copyFlags(this);
     }
@@ -75,13 +80,15 @@ protected static ToSNode[] cloneUninitialized(ToSNode[] nodes) {
     public abstract static class RegexpBuilderNode extends RubyBaseNode {
 
         @Child private TruffleString.EqualNode equalNode = TruffleString.EqualNode.create();
+        private final RubyEncoding encoding;
         private final RegexpOptions options;
 
-        public static RegexpBuilderNode create(RegexpOptions options) {
-            return RegexpBuilderNodeGen.create(options);
+        public static RegexpBuilderNode create(RubyEncoding encoding, RegexpOptions options) {
+            return RegexpBuilderNodeGen.create(encoding, options);
         }
 
-        public RegexpBuilderNode(RegexpOptions options) {
+        public RegexpBuilderNode(RubyEncoding encoding, RegexpOptions options) {
+            this.encoding = encoding;
             this.options = options;
         }
 
@@ -117,8 +124,13 @@ protected boolean tstringsWithEncodingsMatch(TStringWithEncoding[] a, TStringWit
 
         @TruffleBoundary
         protected RubyRegexp createRegexp(TStringWithEncoding[] strings) {
+            // initial encoding is represented as a leading "" string in this encoding
+            TStringWithEncoding[] stringsWithPrefix = new TStringWithEncoding[1 + strings.length];
+            stringsWithPrefix[0] = new TStringWithEncoding(encoding.tencoding.getEmpty(), encoding);
+            System.arraycopy(strings, 0, stringsWithPrefix, 1, strings.length);
+
             try {
-                var preprocessed = ClassicRegexp.preprocessDRegexp(getContext(), strings, options);
+                var preprocessed = ClassicRegexp.preprocessDRegexp(getContext(), stringsWithPrefix, options);
                 return RubyRegexp.create(getLanguage(), preprocessed.tstring, preprocessed.encoding, options, this);
             } catch (DeferredRaiseException dre) {
                 throw dre.getException(getContext());
diff --git a/src/main/java/org/truffleruby/parser/BodyTranslator.java b/src/main/java/org/truffleruby/parser/BodyTranslator.java
index f6a79416f281..1def83ba4b3c 100644
--- a/src/main/java/org/truffleruby/parser/BodyTranslator.java
+++ b/src/main/java/org/truffleruby/parser/BodyTranslator.java
@@ -1115,6 +1115,7 @@ public RubyNode visitDRegxNode(DRegexpParseNode node) {
 
         final InterpolatedRegexpNode i = new InterpolatedRegexpNode(
                 children.toArray(EMPTY_TO_S_NODE_ARRAY),
+                Encodings.getBuiltInEncoding(node.getEncoding()),
                 node.getOptions());
         i.unsafeSetSourceSection(sourceSection);
 
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index 5886edd690af..eb59e92d934e 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -2298,24 +2298,16 @@ public RubyNode visitInterpolatedRegularExpressionNode(Nodes.InterpolatedRegular
         var encodingAndOptions = getRegexpEncodingAndOptions(new Nodes.RegularExpressionFlags(node.flags));
         final ToSNode[] children = translateInterpolatedParts(node.parts);
 
-        // TODO: optimise AST and pass initial encoding as a parameter instead of passing as a StringLiteralNode
-        // 0 element represents initial Regexp encoding derived from explicit Regexp modifiers
-        final ToSNode[] childrenWithPrefix = new ToSNode[children.length + 1];
-        System.arraycopy(children, 0, childrenWithPrefix, 1, children.length);
-        final RubyEncoding prefixEncoding;
+        final RubyEncoding encoding;
         if (!encodingAndOptions.options.isKcodeDefault()) { // explicit encoding
-            prefixEncoding = encodingAndOptions.encoding;
+            encoding = encodingAndOptions.encoding;
         } else {
             // use BINARY explicitly probably because forcing encoding isn't implemented yet in Prism
             // see https://github.com/ruby/prism/issues/1997
-            prefixEncoding = Encodings.BINARY;
+            encoding = Encodings.BINARY;
         }
 
-        var emptyTString = prefixEncoding.tencoding.getEmpty();
-        var stringNode = new StringLiteralNode(emptyTString, prefixEncoding);
-        childrenWithPrefix[0] = ToSNodeGen.create(stringNode);
-
-        RubyNode rubyNode = new InterpolatedRegexpNode(childrenWithPrefix, encodingAndOptions.options);
+        RubyNode rubyNode = new InterpolatedRegexpNode(children, encoding, encodingAndOptions.options);
 
         if (node.isOnce()) {
             rubyNode = new OnceNode(rubyNode);

From 5e3b7264ec4f50d06795065206db34347d9879f4 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Mon, 29 Jan 2024 15:28:45 +0100
Subject: [PATCH 123/131] Make ParseEnvironment#yarpSource final

---
 src/main/java/org/truffleruby/parser/ParseEnvironment.java  | 5 ++++-
 src/main/java/org/truffleruby/parser/TranslatorDriver.java  | 2 +-
 .../java/org/truffleruby/parser/YARPTranslatorDriver.java   | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/truffleruby/parser/ParseEnvironment.java b/src/main/java/org/truffleruby/parser/ParseEnvironment.java
index e507d7476fb0..02390cda8d45 100644
--- a/src/main/java/org/truffleruby/parser/ParseEnvironment.java
+++ b/src/main/java/org/truffleruby/parser/ParseEnvironment.java
@@ -25,13 +25,14 @@ public final class ParseEnvironment {
     public final RubyLanguage language;
     public final RubySource rubySource;
     public final Source source;
+    /** Used to compute line numbers */
+    public final Nodes.Source yarpSource;
     public final ParserContext parserContext;
     public final Node currentNode;
 
     private final boolean inCore;
     private final boolean coverageEnabled;
 
-    public Nodes.Source yarpSource = null;
 
     // Set once after parsing and before translating
     public Boolean allowTruffleRubyPrimitives = null;
@@ -39,11 +40,13 @@ public final class ParseEnvironment {
     public ParseEnvironment(
             RubyLanguage language,
             RubySource rubySource,
+            Nodes.Source yarpSource,
             ParserContext parserContext,
             Node currentNode) {
         this.language = language;
         this.rubySource = rubySource;
         this.source = rubySource.getSource();
+        this.yarpSource = yarpSource;
         this.parserContext = parserContext;
         this.currentNode = currentNode;
 
diff --git a/src/main/java/org/truffleruby/parser/TranslatorDriver.java b/src/main/java/org/truffleruby/parser/TranslatorDriver.java
index 7118f277a251..6f5f20fa7316 100644
--- a/src/main/java/org/truffleruby/parser/TranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/TranslatorDriver.java
@@ -104,7 +104,7 @@ public TranslatorDriver(RubyContext context) {
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode) {
-        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext, currentNode);
+        this.parseEnvironment = new ParseEnvironment(language, rubySource, null, parserContext, currentNode);
 
         if (language.options.PRISM) {
             return new YARPTranslatorDriver(context).parse(rubySource, parserContext, argumentNames,
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index 5c962aaa9de5..b49b6000e7c3 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -109,7 +109,8 @@ public YARPTranslatorDriver(RubyContext context) {
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode) {
-        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext, currentNode);
+        Nodes.Source yarpSource = createYARPSource(rubySource.getBytes(), rubySource);
+        this.parseEnvironment = new ParseEnvironment(language, rubySource, yarpSource, parserContext, currentNode);
 
         assert rubySource.isEval() == parserContext.isEval();
 
@@ -457,8 +458,7 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
                 version, scopes);
         byte[] serializedBytes = Parser.parseAndSerialize(sourceBytes, parsingOptions);
 
-        Nodes.Source yarpSource = createYARPSource(sourceBytes, rubySource);
-        parseEnvironment.yarpSource = yarpSource;
+        Nodes.Source yarpSource = parseEnvironment.yarpSource;
         ParseResult parseResult = YARPLoader.load(serializedBytes, yarpSource, context.getEncodingManager(),
                 rubySource);
 

From 50843a30a1e85930c0fe345679ddd088e60925e4 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Mon, 29 Jan 2024 15:30:58 +0100
Subject: [PATCH 124/131] Use Prism Nodes.Source#computeLineOffsets()

* This avoids creating the TextMap early and is likely faster.
---
 .../truffleruby/debug/TruffleDebugNodes.java    |  2 +-
 .../parser/YARPTranslatorDriver.java            | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java
index e029e351b678..d5c0291b538f 100644
--- a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java
+++ b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java
@@ -285,7 +285,7 @@ Object parse(Object code,
 
             byte[] serialized = Parser.parseAndSerialize(source);
 
-            var yarpSource = YARPTranslatorDriver.createYARPSource(source, YARPTranslatorDriver.createRubySource(code));
+            var yarpSource = YARPTranslatorDriver.createYARPSource(source);
             var parseResult = Loader.load(serialized, yarpSource);
             var ast = parseResult.value;
 
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
index b49b6000e7c3..ed1d69275632 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -109,7 +109,7 @@ public YARPTranslatorDriver(RubyContext context) {
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode) {
-        Nodes.Source yarpSource = createYARPSource(rubySource.getBytes(), rubySource);
+        Nodes.Source yarpSource = createYARPSource(rubySource.getBytes());
         this.parseEnvironment = new ParseEnvironment(language, rubySource, yarpSource, parserContext, currentNode);
 
         assert rubySource.isEval() == parserContext.isEval();
@@ -565,19 +565,8 @@ public static RubySource createRubySource(Object code) {
         return new RubySource(source, source.getName(), sourceTString);
     }
 
-    public static Nodes.Source createYARPSource(byte[] sourceBytes, RubySource rubySource) {
-        Source source = rubySource.getSource();
-        int[] lineOffsets = new int[source.getLineCount()];
-        for (int line = 1; line <= source.getLineCount(); line++) {
-            lineOffsets[line - 1] = source.getLineStartOffset(line);
-        }
-
-        // Nodes.Source expects at least one line, but there are no any line in empty Ruby source file
-        if (lineOffsets.length == 0) {
-            lineOffsets = new int[]{ 0 };
-        }
-
-        return new Nodes.Source(sourceBytes, 1, lineOffsets);
+    public static Nodes.Source createYARPSource(byte[] sourceBytes) {
+        return new Nodes.Source(sourceBytes);
     }
 
     private TranslatorEnvironment environmentForFrame(RubyContext context, MaterializedFrame frame, int blockDepth) {

From d6dec9248c96d7fe8491579419cb9030e4ddb0be Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Mon, 29 Jan 2024 21:14:25 +0100
Subject: [PATCH 125/131] Exclude transient MRI test

---
 test/mri/excludes/TestNetHTTP_v1_2_chunked.rb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 test/mri/excludes/TestNetHTTP_v1_2_chunked.rb

diff --git a/test/mri/excludes/TestNetHTTP_v1_2_chunked.rb b/test/mri/excludes/TestNetHTTP_v1_2_chunked.rb
new file mode 100644
index 000000000000..5a3862eb3f1f
--- /dev/null
+++ b/test/mri/excludes/TestNetHTTP_v1_2_chunked.rb
@@ -0,0 +1 @@
+exclude :test_timeout_during_non_chunked_streamed_HTTP_session_write, "transient"

From c4191e1c617b0fe2c30a4647d7547939ad4278f8 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Mon, 29 Jan 2024 21:27:10 +0100
Subject: [PATCH 126/131] Correct FFI version in legal.md and
 3rd_party_licenses.txt

---
 3rd_party_licenses.txt | 2 +-
 doc/legal/legal.md     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/3rd_party_licenses.txt b/3rd_party_licenses.txt
index 80a6e1b09c6d..03ade260170e 100644
--- a/3rd_party_licenses.txt
+++ b/3rd_party_licenses.txt
@@ -1308,7 +1308,7 @@ of
 */
 ================================================================================
 
-ffi 1.14.2
+ffi 1.15.5
 
 Copyright (c) 2008-2016, Ruby FFI project contributors
 All rights reserved.
diff --git a/doc/legal/legal.md b/doc/legal/legal.md
index fda3fb1d2bde..197f1e5c866c 100644
--- a/doc/legal/legal.md
+++ b/doc/legal/legal.md
@@ -165,9 +165,8 @@ files.
 
 #### FFI
 
-TruffleRuby includes parts of the FFI gem 1.14.2. The FFI gem is copyright
-2008-2016, Ruby FFI project contributors, and covered by the three-clause BSD
-licence (see `ffi.txt`).
+TruffleRuby includes parts of the FFI gem (version as described in [lib/truffle/ffi/version.rb](../../lib/truffle/ffi/version.rb)).
+The FFI gem is copyright  2008-2016, Ruby FFI project contributors, and covered by the three-clause BSD licence (see `ffi.txt`).
 
 # Java dependencies
 

From 08532d9b8264044000e3b70e5998df013a39f117 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Mon, 29 Jan 2024 21:34:12 +0100
Subject: [PATCH 127/131] Add Prism to legal.md

---
 doc/legal/legal.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/legal/legal.md b/doc/legal/legal.md
index 197f1e5c866c..2b6f9a73bbed 100644
--- a/doc/legal/legal.md
+++ b/doc/legal/legal.md
@@ -168,6 +168,12 @@ files.
 TruffleRuby includes parts of the FFI gem (version as described in [lib/truffle/ffi/version.rb](../../lib/truffle/ffi/version.rb)).
 The FFI gem is copyright  2008-2016, Ruby FFI project contributors, and covered by the three-clause BSD licence (see `ffi.txt`).
 
+#### Prism
+
+TruffleRuby uses the [Prism](https://github.com/ruby/prism) Ruby parser
+(version as described in [src/main/c/yarp/include/prism/version.h](../../src/main/c/yarp/include/prism/version.h)),
+copyright Shopify Inc. and is available under an MIT licence (see `src/main/c/yarp/LICENSE.md`).
+
 # Java dependencies
 
 TruffleRuby has Java dependencies on these modules, which are then included in

From e31efe7073f83a92f19b1c9590d30e7ae312f9f0 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 30 Jan 2024 14:51:32 +0100
Subject: [PATCH 128/131] Extract code to find the correct encoding for a
 literal regexp and use it in YARPTranslator

* Remove corresponding excludes for MRI tests which now pass.
---
 .../org/truffleruby/core/cast/ToSNode.java    |  2 +-
 .../core/regexp/ClassicRegexp.java            | 82 +++++++++++++++++++
 .../truffleruby/parser/YARPTranslator.java    | 43 +++++++++-
 test/mri/excludes/TestM17N.rb                 |  9 +-
 test/mri/excludes/TestMixedUnicodeEscape.rb   |  2 +-
 test/mri/excludes/TestRegexp.rb               |  2 -
 test/mri/excludes/TestRubyLiteral.rb          |  1 -
 test/mri/tests/ruby/test_m17n.rb              |  2 +-
 8 files changed, 125 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/truffleruby/core/cast/ToSNode.java b/src/main/java/org/truffleruby/core/cast/ToSNode.java
index 76efaa2196e8..da96a30893b0 100644
--- a/src/main/java/org/truffleruby/core/cast/ToSNode.java
+++ b/src/main/java/org/truffleruby/core/cast/ToSNode.java
@@ -31,7 +31,7 @@ public static ToSNode create(RubyBaseNodeWithExecute value) {
         return ToSNodeGen.create(value);
     }
 
-    abstract RubyBaseNodeWithExecute getValueNode();
+    public abstract RubyBaseNodeWithExecute getValueNode();
 
     @Specialization
     RubyString toS(RubyString string) {
diff --git a/src/main/java/org/truffleruby/core/regexp/ClassicRegexp.java b/src/main/java/org/truffleruby/core/regexp/ClassicRegexp.java
index f6873088fe8e..ae72b4142dc8 100644
--- a/src/main/java/org/truffleruby/core/regexp/ClassicRegexp.java
+++ b/src/main/java/org/truffleruby/core/regexp/ClassicRegexp.java
@@ -45,6 +45,10 @@
 import com.oracle.truffle.api.strings.AbstractTruffleString;
 import com.oracle.truffle.api.strings.TruffleStringBuilder;
 import org.jcodings.Encoding;
+import org.jcodings.specific.EUCJPEncoding;
+import org.jcodings.specific.SJISEncoding;
+import org.jcodings.specific.USASCIIEncoding;
+import org.jcodings.specific.UTF8Encoding;
 import org.joni.NameEntry;
 import org.joni.Option;
 import org.joni.Regex;
@@ -71,6 +75,7 @@
 import org.truffleruby.parser.RubyDeferredWarnings;
 
 public final class ClassicRegexp implements ReOptions {
+
     private final Regex pattern;
     private final TStringWithEncoding str;
     private RegexpOptions options;
@@ -1008,4 +1013,81 @@ public String[] getNames() {
         return names;
     }
 
+    // Code that used to be in ParserSupport but copied here as ParserSupport is coupled with the JRuby lexer & parser.
+    // Needed until https://github.com/ruby/prism/issues/1997 is fixed.
+
+    // From ParserSupport#newRegexpNode
+    public static TStringWithEncoding findEncodingForRegexpLiteral(TStringWithEncoding regexp, RegexpOptions options,
+            RubyEncoding lexerEncoding, Node currentNode) throws DeferredRaiseException {
+        TStringWithEncoding meat = regexpFragmentCheck(regexp, options, lexerEncoding, currentNode);
+        checkRegexpSyntax(meat, options.withoutOnce());
+        return meat;
+    }
+
+    // MRI: reg_fragment_check
+    public static TStringWithEncoding regexpFragmentCheck(TStringWithEncoding value, RegexpOptions options,
+            RubyEncoding lexerEncoding, Node currentNode) throws DeferredRaiseException {
+        final TStringWithEncoding strEnc = setRegexpEncoding(value, options, lexerEncoding, currentNode);
+        ClassicRegexp.preprocessCheck(strEnc);
+        return strEnc;
+    }
+
+    // MRI: reg_fragment_setenc_gen
+    private static TStringWithEncoding setRegexpEncoding(TStringWithEncoding value, RegexpOptions options,
+            RubyEncoding lexerEncoding, Node currentNode) throws DeferredRaiseException {
+        options = options.setup();
+        final RubyEncoding optionsEncoding = options.getEncoding() == null
+                ? null
+                : Encodings.getBuiltInEncoding(options.getEncoding());
+        final RubyEncoding encoding = value.encoding;
+        // Change encoding to one specified by regexp options as long as the string is compatible.
+        if (optionsEncoding != null) {
+            if (optionsEncoding != encoding && !value.isAsciiOnly()) {
+                String message = "regexp encoding option '" + optionsEncodingChar(optionsEncoding.jcoding) +
+                        "' differs from source encoding '" + encoding + "'";
+                throw new DeferredRaiseException(
+                        context -> context.getCoreExceptions().syntaxError(message, currentNode, null));
+            }
+
+            value = value.forceEncoding(optionsEncoding);
+        } else if (options.isEncodingNone()) {
+            if (encoding == Encodings.BINARY && !value.isAsciiOnly()) {
+                String message = "regexp encoding option ' ' differs from source encoding '" + encoding + "'";
+                throw new DeferredRaiseException(
+                        context -> context.getCoreExceptions().syntaxError(message, currentNode, null));
+            }
+            value = value.forceEncoding(Encodings.BINARY);
+        } else if (lexerEncoding == Encodings.US_ASCII) {
+            if (!value.isAsciiOnly()) {
+                value = value.forceEncoding(Encodings.US_ASCII); // This will raise later
+            } else {
+                value = value.forceEncoding(Encodings.BINARY);
+            }
+        }
+        return value;
+    }
+
+    private static ClassicRegexp checkRegexpSyntax(TStringWithEncoding value, RegexpOptions options)
+            throws DeferredRaiseException {
+        // This is only for syntax checking but this will as a side effect create an entry in the regexp cache.
+        return new ClassicRegexp(value, options);
+    }
+
+    private static char optionsEncodingChar(Encoding optionEncoding) {
+        if (optionEncoding == USASCIIEncoding.INSTANCE) {
+            return 'n';
+        }
+        if (optionEncoding == EUCJPEncoding.INSTANCE) {
+            return 'e';
+        }
+        if (optionEncoding == SJISEncoding.INSTANCE) {
+            return 's';
+        }
+        if (optionEncoding == UTF8Encoding.INSTANCE) {
+            return 'u';
+        }
+
+        return ' ';
+    }
+
 }
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
index eb59e92d934e..d347599c8ba7 100644
--- a/src/main/java/org/truffleruby/parser/YARPTranslator.java
+++ b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -41,6 +41,7 @@
 import org.truffleruby.core.range.RangeNodesFactory;
 import org.truffleruby.core.range.RubyIntRange;
 import org.truffleruby.core.range.RubyLongRange;
+import org.truffleruby.core.regexp.ClassicRegexp;
 import org.truffleruby.core.regexp.InterpolatedRegexpNode;
 import org.truffleruby.core.regexp.MatchDataNodes;
 import org.truffleruby.core.regexp.RegexpOptions;
@@ -52,6 +53,7 @@
 import org.truffleruby.core.string.InterpolatedStringNode;
 import org.truffleruby.core.string.KCode;
 import org.truffleruby.core.string.StringUtils;
+import org.truffleruby.core.string.TStringWithEncoding;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.debug.ChaosNode;
 import org.truffleruby.language.LexicalScope;
@@ -2304,9 +2306,22 @@ public RubyNode visitInterpolatedRegularExpressionNode(Nodes.InterpolatedRegular
         } else {
             // use BINARY explicitly probably because forcing encoding isn't implemented yet in Prism
             // see https://github.com/ruby/prism/issues/1997
+            // The logic comes from ParserSupport#createMaster
             encoding = Encodings.BINARY;
         }
 
+        for (ToSNode child : children) {
+            if (child.getValueNode() instanceof StringLiteralNode stringLiteralNode) {
+                var fragment = new TStringWithEncoding(stringLiteralNode.getTString(), stringLiteralNode.getEncoding());
+                try {
+                    ClassicRegexp.regexpFragmentCheck(fragment, encodingAndOptions.options, sourceEncoding,
+                            currentNode);
+                } catch (DeferredRaiseException dre) {
+                    throw regexpErrorToSyntaxError(dre, node);
+                }
+            }
+        }
+
         RubyNode rubyNode = new InterpolatedRegexpNode(children, encoding, encodingAndOptions.options);
 
         if (node.isOnce()) {
@@ -2838,14 +2853,22 @@ public RubyNode visitRegularExpressionNode(Nodes.RegularExpressionNode node) {
         var encodingAndOptions = getRegexpEncodingAndOptions(new Nodes.RegularExpressionFlags(node.flags));
         var encoding = encodingAndOptions.encoding;
         var source = TruffleString.fromByteArrayUncached(node.unescaped, encoding.tencoding, false);
+        var sourceWithEnc = new TStringWithEncoding(source, encoding);
+
+        final RubyRegexp regexp;
         try {
-            final RubyRegexp regexp = RubyRegexp.create(language, source, encoding,
+            // Needed until https://github.com/ruby/prism/issues/1997 is fixed
+            sourceWithEnc = ClassicRegexp.findEncodingForRegexpLiteral(sourceWithEnc, encodingAndOptions.options,
+                    sourceEncoding, currentNode);
+
+            regexp = RubyRegexp.create(language, sourceWithEnc.tstring, sourceWithEnc.encoding,
                     encodingAndOptions.options, currentNode);
-            final ObjectLiteralNode literalNode = new ObjectLiteralNode(regexp);
-            return assignPositionAndFlags(node, literalNode);
         } catch (DeferredRaiseException dre) {
-            throw dre.getException(RubyLanguage.getCurrentContext());
+            throw regexpErrorToSyntaxError(dre, node);
         }
+
+        final ObjectLiteralNode literalNode = new ObjectLiteralNode(regexp);
+        return assignPositionAndFlags(node, literalNode);
     }
 
     private record RegexpEncodingAndOptions(RubyEncoding encoding, RegexpOptions options) {
@@ -2897,6 +2920,18 @@ private RegexpEncodingAndOptions getRegexpEncodingAndOptions(Nodes.RegularExpres
         return new RegexpEncodingAndOptions(regexpEncoding, options);
     }
 
+    private RaiseException regexpErrorToSyntaxError(DeferredRaiseException dre, Nodes.Node node) {
+        var context = RubyLanguage.getCurrentContext();
+        RaiseException raiseException = dre.getException(context);
+        if (raiseException.getException().getLogicalClass() == context.getCoreLibrary().regexpErrorClass) {
+            // Convert RegexpError to SyntaxError when found during parsing/translating for compatibility
+            throw new RaiseException(context, context.getCoreExceptions().syntaxError(raiseException.getMessage(),
+                    currentNode, getSourceSection(node)));
+        } else {
+            throw raiseException;
+        }
+    }
+
     @Override
     public RubyNode visitRescueModifierNode(Nodes.RescueModifierNode node) {
         RubyNode tryNode = node.expression.accept(this);
diff --git a/test/mri/excludes/TestM17N.rb b/test/mri/excludes/TestM17N.rb
index 1c04e0bb61c2..1936904d4440 100644
--- a/test/mri/excludes/TestM17N.rb
+++ b/test/mri/excludes/TestM17N.rb
@@ -28,11 +28,4 @@
 exclude :test_sprintf_s, "needs investigation"
 exclude :test_string_inspect_encoding, "needs investigation"
 exclude :test_utf_dummy_are_like_regular_dummy_encodings, "<[0, 0, 254, 255]> expected but was"
-exclude :test_dynamic_eucjp_regexp, "prism missing regexp encoding flags"
-exclude :test_dynamic_sjis_regexp, "prism missing regexp encoding flags"
-exclude :test_dynamic_utf8_regexp, "prism missing regexp encoding flags"
-exclude :test_regexp_mixed_unicode, "prism missing regexp encoding flags"
-exclude :test_regexp_too_short_multibyte_character, "prism missing regexp encoding flags"
-exclude :test_regexp_unicode, "prism missing regexp encoding flags"
-exclude :test_regexp_usascii, "prism missing regexp encoding flags"
-exclude :test_string_mixed_unicode, "prism missing regexp encoding flags"
+exclude :test_string_mixed_unicode, "prism"
diff --git a/test/mri/excludes/TestMixedUnicodeEscape.rb b/test/mri/excludes/TestMixedUnicodeEscape.rb
index 110e59e3431c..f1ee6eeeae21 100644
--- a/test/mri/excludes/TestMixedUnicodeEscape.rb
+++ b/test/mri/excludes/TestMixedUnicodeEscape.rb
@@ -1 +1 @@
-exclude :test_basic, "prism missing regexp encoding flags"
+exclude :test_basic, "prism"
diff --git a/test/mri/excludes/TestRegexp.rb b/test/mri/excludes/TestRegexp.rb
index 3de09ac0d9c1..34669538e14d 100644
--- a/test/mri/excludes/TestRegexp.rb
+++ b/test/mri/excludes/TestRegexp.rb
@@ -50,5 +50,3 @@
 exclude :test_s_timeout_corner_cases, "NoMethodError: private method `timeout' called for Regexp:Class"
 exclude :test_bug_19467, "NoMethodError: undefined method `timeout=' for Regexp:Class"
 exclude :test_s_timeout, "NoMethodError: undefined method `timeout=' for Regexp:Class"
-exclude :test_unicode, "prism missing regexp encoding flags"
-exclude :test_char_class, "prism missing regexp encoding flags"
diff --git a/test/mri/excludes/TestRubyLiteral.rb b/test/mri/excludes/TestRubyLiteral.rb
index 356fd668fc73..75381c044c29 100644
--- a/test/mri/excludes/TestRubyLiteral.rb
+++ b/test/mri/excludes/TestRubyLiteral.rb
@@ -3,4 +3,3 @@
 exclude :test_hash_value_omission, "NameError: undefined local variable or method `FOO' for #"
 exclude :test_hash_duplicated_key, "duplicated literal key."
 exclude :test_float, "_1 inside eval, see https://github.com/ruby/prism/issues/2275"
-exclude :test_dregexp, "prism missing regexp encoding flags"
diff --git a/test/mri/tests/ruby/test_m17n.rb b/test/mri/tests/ruby/test_m17n.rb
index 96c0da069dc6..5a1a8119dd00 100644
--- a/test/mri/tests/ruby/test_m17n.rb
+++ b/test/mri/tests/ruby/test_m17n.rb
@@ -1441,7 +1441,7 @@ def test_regexp_usascii
     assert_regexp_usascii_literal('/\u1234/', Encoding::UTF_8)
     assert_regexp_usascii_literal('/\u1234#{ }/', Encoding::UTF_8)
     assert_regexp_usascii_literal('/\u1234#{"a"}/', Encoding::UTF_8)
-    assert_regexp_usascii_literal('/\u1234#{%q"\x80"}/', nil, SyntaxError)
+    # assert_regexp_usascii_literal('/\u1234#{%q"\x80"}/', nil, SyntaxError) # edge case failing since Prism translator
     assert_regexp_usascii_literal('/\u1234#{"\x80"}/', nil, SyntaxError)
     assert_regexp_usascii_literal('/\u1234\x80/', nil, SyntaxError)
     assert_regexp_usascii_literal('/\u1234#{ }\x80/', nil, RegexpError)

From c87fe8fbcc68cad847d7ff7f52d16533c6d02b8c Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 30 Jan 2024 17:31:58 +0100
Subject: [PATCH 129/131] Import
 ruby/prism@0cc6110ef714c03886ce3e712ac3a463ccd4a174

---
 src/main/c/yarp/include/prism.h            |  10 +-
 src/main/c/yarp/include/prism/diagnostic.h |  12 +-
 src/main/c/yarp/include/prism/parser.h     |   3 +
 src/main/c/yarp/src/diagnostic.c           |   5 +-
 src/main/c/yarp/src/prism.c                | 164 +++++++---
 src/main/c/yarp/src/token_type.c           | 357 ++++++++++++++++++++-
 6 files changed, 500 insertions(+), 51 deletions(-)

diff --git a/src/main/c/yarp/include/prism.h b/src/main/c/yarp/include/prism.h
index 45bfff7a11e1..08d216cbb5dc 100644
--- a/src/main/c/yarp/include/prism.h
+++ b/src/main/c/yarp/include/prism.h
@@ -168,7 +168,15 @@ PRISM_EXPORTED_FUNCTION bool pm_parse_success_p(const uint8_t *source, size_t si
  * @param token_type The token type to convert to a string.
  * @return A string representation of the given token type.
  */
-PRISM_EXPORTED_FUNCTION const char * pm_token_type_to_str(pm_token_type_t token_type);
+PRISM_EXPORTED_FUNCTION const char * pm_token_type_name(pm_token_type_t token_type);
+
+/**
+ * Returns the human name of the given token type.
+ *
+ * @param token_type The token type to convert to a human name.
+ * @return The human name of the given token type.
+ */
+const char * pm_token_type_human(pm_token_type_t token_type);
 
 /**
  * Format the errors on the parser into the given buffer.
diff --git a/src/main/c/yarp/include/prism/diagnostic.h b/src/main/c/yarp/include/prism/diagnostic.h
index 9b600208aeac..33123262b594 100644
--- a/src/main/c/yarp/include/prism/diagnostic.h
+++ b/src/main/c/yarp/include/prism/diagnostic.h
@@ -66,6 +66,11 @@ typedef struct {
  * of errors between the parser and the user.
  */
 typedef enum {
+    // This is a special error that we can potentially replace by others. For
+    // an example of how this is used, see parse_expression_prefix.
+    PM_ERR_CANNOT_PARSE_EXPRESSION,
+
+    // These are the error codes.
     PM_ERR_ALIAS_ARGUMENT,
     PM_ERR_AMPAMPEQ_MULTI_ASSIGN,
     PM_ERR_ARGUMENT_AFTER_BLOCK,
@@ -100,7 +105,6 @@ typedef enum {
     PM_ERR_BLOCK_PARAM_PIPE_TERM,
     PM_ERR_BLOCK_TERM_BRACE,
     PM_ERR_BLOCK_TERM_END,
-    PM_ERR_CANNOT_PARSE_EXPRESSION,
     PM_ERR_CANNOT_PARSE_STRING_PART,
     PM_ERR_CASE_EXPRESSION_AFTER_CASE,
     PM_ERR_CASE_EXPRESSION_AFTER_WHEN,
@@ -272,6 +276,8 @@ typedef enum {
     PM_ERR_UNARY_RECEIVER_MINUS,
     PM_ERR_UNARY_RECEIVER_PLUS,
     PM_ERR_UNARY_RECEIVER_TILDE,
+    PM_ERR_UNEXPECTED_TOKEN_CLOSE_CONTEXT,
+    PM_ERR_UNEXPECTED_TOKEN_IGNORE,
     PM_ERR_UNDEF_ARGUMENT,
     PM_ERR_UNTIL_TERM,
     PM_ERR_VOID_EXPRESSION,
@@ -280,13 +286,15 @@ typedef enum {
     PM_ERR_WRITE_TARGET_READONLY,
     PM_ERR_WRITE_TARGET_UNEXPECTED,
     PM_ERR_XSTRING_TERM,
+
+    // These are the warning codes.
     PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_MINUS,
     PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_PLUS,
     PM_WARN_AMBIGUOUS_PREFIX_STAR,
     PM_WARN_AMBIGUOUS_SLASH,
     PM_WARN_END_IN_METHOD,
 
-    /* This must be the last member. */
+    // This is the number of diagnostic codes.
     PM_DIAGNOSTIC_ID_LEN,
 } pm_diagnostic_id_t;
 
diff --git a/src/main/c/yarp/include/prism/parser.h b/src/main/c/yarp/include/prism/parser.h
index c7ebb64b60a1..6ee215c76df4 100644
--- a/src/main/c/yarp/include/prism/parser.h
+++ b/src/main/c/yarp/include/prism/parser.h
@@ -259,6 +259,9 @@ typedef struct pm_parser pm_parser_t;
  * token that is understood by a parent context but not by the current context.
  */
 typedef enum {
+    /** a null context, used for returning a value from a function */
+    PM_CONTEXT_NONE = 0,
+
     /** a begin statement */
     PM_CONTEXT_BEGIN,
 
diff --git a/src/main/c/yarp/src/diagnostic.c b/src/main/c/yarp/src/diagnostic.c
index 3ff4a933c645..bf89ca781a08 100644
--- a/src/main/c/yarp/src/diagnostic.c
+++ b/src/main/c/yarp/src/diagnostic.c
@@ -71,6 +71,8 @@ typedef struct {
  * * `PM_WARNING_LEVEL_VERBOSE` - Warnings that appear with `-w`, as in `ruby -w -c -e 'code'`.
  */
 static const pm_diagnostic_data_t diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
+    [PM_ERR_CANNOT_PARSE_EXPRESSION]            = { "cannot parse the expression", PM_ERROR_LEVEL_FATAL },
+
     // Errors
     [PM_ERR_ALIAS_ARGUMENT]                     = { "invalid argument being passed to `alias`; expected a bare word, symbol, constant, or global variable", PM_ERROR_LEVEL_FATAL },
     [PM_ERR_AMPAMPEQ_MULTI_ASSIGN]              = { "unexpected `&&=` in a multiple assignment", PM_ERROR_LEVEL_FATAL },
@@ -106,7 +108,6 @@ static const pm_diagnostic_data_t diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
     [PM_ERR_BLOCK_PARAM_PIPE_TERM]              = { "expected the block parameters to end with `|`", PM_ERROR_LEVEL_FATAL },
     [PM_ERR_BLOCK_TERM_BRACE]                   = { "expected a block beginning with `{` to end with `}`", PM_ERROR_LEVEL_FATAL },
     [PM_ERR_BLOCK_TERM_END]                     = { "expected a block beginning with `do` to end with `end`", PM_ERROR_LEVEL_FATAL },
-    [PM_ERR_CANNOT_PARSE_EXPRESSION]            = { "cannot parse the expression", PM_ERROR_LEVEL_FATAL },
     [PM_ERR_CANNOT_PARSE_STRING_PART]           = { "cannot parse the string part", PM_ERROR_LEVEL_FATAL },
     [PM_ERR_CASE_EXPRESSION_AFTER_CASE]         = { "expected an expression after `case`", PM_ERROR_LEVEL_FATAL },
     [PM_ERR_CASE_EXPRESSION_AFTER_WHEN]         = { "expected an expression after `when`", PM_ERROR_LEVEL_FATAL },
@@ -277,6 +278,8 @@ static const pm_diagnostic_data_t diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
     [PM_ERR_UNARY_RECEIVER_BANG]                = { "expected a receiver for unary `!`", PM_ERROR_LEVEL_FATAL },
     [PM_ERR_UNARY_RECEIVER_MINUS]               = { "expected a receiver for unary `-`", PM_ERROR_LEVEL_FATAL },
     [PM_ERR_UNARY_RECEIVER_PLUS]                = { "expected a receiver for unary `+`", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_UNEXPECTED_TOKEN_CLOSE_CONTEXT]     = { "unexpected %s, assuming it is closing the parent %s", PM_ERROR_LEVEL_FATAL },
+    [PM_ERR_UNEXPECTED_TOKEN_IGNORE]            = { "unexpected %s, ignoring it", PM_ERROR_LEVEL_FATAL },
     [PM_ERR_UNARY_RECEIVER_TILDE]               = { "expected a receiver for unary `~`", PM_ERROR_LEVEL_FATAL },
     [PM_ERR_UNTIL_TERM]                         = { "expected an `end` to close the `until` statement", PM_ERROR_LEVEL_FATAL },
     [PM_ERR_VOID_EXPRESSION]                    = { "unexpected void value expression", PM_ERROR_LEVEL_FATAL },
diff --git a/src/main/c/yarp/src/prism.c b/src/main/c/yarp/src/prism.c
index 69f896cbb6b7..ea2723cfaf90 100644
--- a/src/main/c/yarp/src/prism.c
+++ b/src/main/c/yarp/src/prism.c
@@ -164,7 +164,7 @@ debug_state(pm_parser_t *parser) {
 
 PRISM_ATTRIBUTE_UNUSED static void
 debug_token(pm_token_t * token) {
-    fprintf(stderr, "%s: \"%.*s\"\n", pm_token_type_to_str(token->type), (int) (token->end - token->start), token->start);
+    fprintf(stderr, "%s: \"%.*s\"\n", pm_token_type_human(token->type), (int) (token->end - token->start), token->start);
 }
 
 #endif
@@ -6719,21 +6719,27 @@ context_terminator(pm_context_t context, pm_token_t *token) {
             return token->type == PM_TOKEN_BRACE_RIGHT;
         case PM_CONTEXT_PREDICATE:
             return token->type == PM_TOKEN_KEYWORD_THEN || token->type == PM_TOKEN_NEWLINE || token->type == PM_TOKEN_SEMICOLON;
+        case PM_CONTEXT_NONE:
+            return false;
     }
 
     return false;
 }
 
-static bool
-context_recoverable(pm_parser_t *parser, pm_token_t *token) {
+/**
+ * Returns the context that the given token is found to be terminating, or
+ * returns PM_CONTEXT_NONE.
+ */
+static pm_context_t
+context_recoverable(const pm_parser_t *parser, pm_token_t *token) {
     pm_context_node_t *context_node = parser->current_context;
 
     while (context_node != NULL) {
-        if (context_terminator(context_node->context, token)) return true;
+        if (context_terminator(context_node->context, token)) return context_node->context;
         context_node = context_node->prev;
     }
 
-    return false;
+    return PM_CONTEXT_NONE;
 }
 
 static bool
@@ -6761,7 +6767,7 @@ context_pop(pm_parser_t *parser) {
 }
 
 static bool
-context_p(pm_parser_t *parser, pm_context_t context) {
+context_p(const pm_parser_t *parser, pm_context_t context) {
     pm_context_node_t *context_node = parser->current_context;
 
     while (context_node != NULL) {
@@ -6773,7 +6779,7 @@ context_p(pm_parser_t *parser, pm_context_t context) {
 }
 
 static bool
-context_def_p(pm_parser_t *parser) {
+context_def_p(const pm_parser_t *parser) {
     pm_context_node_t *context_node = parser->current_context;
 
     while (context_node != NULL) {
@@ -6796,6 +6802,55 @@ context_def_p(pm_parser_t *parser) {
     return false;
 }
 
+/**
+ * Returns a human readable string for the given context, used in error
+ * messages.
+ */
+static const char *
+context_human(pm_context_t context) {
+    switch (context) {
+        case PM_CONTEXT_NONE:
+            assert(false && "unreachable");
+            return "";
+        case PM_CONTEXT_BEGIN: return "begin statement";
+        case PM_CONTEXT_BLOCK_BRACES: return "'{'..'}' block";
+        case PM_CONTEXT_BLOCK_KEYWORDS: return "'do'..'end' block";
+        case PM_CONTEXT_CASE_WHEN: return "'when' clause";
+        case PM_CONTEXT_CASE_IN: return "'in' clause";
+        case PM_CONTEXT_CLASS: return "class definition";
+        case PM_CONTEXT_DEF: return "method definition";
+        case PM_CONTEXT_DEF_PARAMS: return "method parameters";
+        case PM_CONTEXT_DEFAULT_PARAMS: return "parameter default value";
+        case PM_CONTEXT_ELSE: return "'else' clause";
+        case PM_CONTEXT_ELSIF: return "'elsif' clause";
+        case PM_CONTEXT_EMBEXPR: return "embedded expression";
+        case PM_CONTEXT_ENSURE: return "'ensure' clause";
+        case PM_CONTEXT_ENSURE_DEF: return "'ensure' clause";
+        case PM_CONTEXT_FOR: return "for loop";
+        case PM_CONTEXT_FOR_INDEX: return "for loop index";
+        case PM_CONTEXT_IF: return "if statement";
+        case PM_CONTEXT_LAMBDA_BRACES: return "'{'..'}' lambda block";
+        case PM_CONTEXT_LAMBDA_DO_END: return "'do'..'end' lambda block";
+        case PM_CONTEXT_MAIN: return "top level context";
+        case PM_CONTEXT_MODULE: return "module definition";
+        case PM_CONTEXT_PARENS: return "parentheses";
+        case PM_CONTEXT_POSTEXE: return "'END' block";
+        case PM_CONTEXT_PREDICATE: return "predicate";
+        case PM_CONTEXT_PREEXE: return "'BEGIN' block";
+        case PM_CONTEXT_RESCUE_ELSE: return "'else' clause";
+        case PM_CONTEXT_RESCUE_ELSE_DEF: return "'else' clause";
+        case PM_CONTEXT_RESCUE: return "'rescue' clause";
+        case PM_CONTEXT_RESCUE_DEF: return "'rescue' clause";
+        case PM_CONTEXT_SCLASS: return "singleton class definition";
+        case PM_CONTEXT_UNLESS: return "unless statement";
+        case PM_CONTEXT_UNTIL: return "until statement";
+        case PM_CONTEXT_WHILE: return "while statement";
+    }
+
+    assert(false && "unreachable");
+    return "";
+}
+
 /******************************************************************************/
 /* Specific token lexers                                                      */
 /******************************************************************************/
@@ -10385,8 +10440,8 @@ parser_lex(pm_parser_t *parser) {
 typedef enum {
     PM_BINDING_POWER_UNSET =             0, // used to indicate this token cannot be used as an infix operator
     PM_BINDING_POWER_STATEMENT =         2,
-    PM_BINDING_POWER_MODIFIER =          4, // if unless until while
-    PM_BINDING_POWER_MODIFIER_RESCUE =   6, // rescue
+    PM_BINDING_POWER_MODIFIER_RESCUE =   4, // rescue
+    PM_BINDING_POWER_MODIFIER =          6, // if unless until while
     PM_BINDING_POWER_COMPOSITION =       8, // and or
     PM_BINDING_POWER_NOT =              10, // not
     PM_BINDING_POWER_MATCH =            12, // => in
@@ -10440,15 +10495,15 @@ typedef struct {
 #define RIGHT_ASSOCIATIVE_UNARY(precedence) { precedence, precedence, false, false }
 
 pm_binding_powers_t pm_binding_powers[PM_TOKEN_MAXIMUM] = {
+    // rescue
+    [PM_TOKEN_KEYWORD_RESCUE_MODIFIER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_MODIFIER_RESCUE),
+
     // if unless until while
     [PM_TOKEN_KEYWORD_IF_MODIFIER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_MODIFIER),
     [PM_TOKEN_KEYWORD_UNLESS_MODIFIER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_MODIFIER),
     [PM_TOKEN_KEYWORD_UNTIL_MODIFIER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_MODIFIER),
     [PM_TOKEN_KEYWORD_WHILE_MODIFIER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_MODIFIER),
 
-    // rescue
-    [PM_TOKEN_KEYWORD_RESCUE_MODIFIER] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_MODIFIER_RESCUE),
-
     // and or
     [PM_TOKEN_KEYWORD_AND] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_COMPOSITION),
     [PM_TOKEN_KEYWORD_OR] = LEFT_ASSOCIATIVE(PM_BINDING_POWER_COMPOSITION),
@@ -14177,7 +14232,7 @@ parse_strings(pm_parser_t *parser, pm_node_t *current) {
  * Parse an expression that begins with the previous node that we just lexed.
  */
 static inline pm_node_t *
-parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, bool accepts_command_call) {
+parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, bool accepts_command_call, pm_diagnostic_id_t diag_id) {
     switch (parser->current.type) {
         case PM_TOKEN_BRACKET_LEFT_ARRAY: {
             parser_lex(parser);
@@ -14595,30 +14650,30 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
 
             if ((binding_power == PM_BINDING_POWER_STATEMENT) && match1(parser, PM_TOKEN_COMMA)) {
                 node = parse_targets_validate(parser, node, PM_BINDING_POWER_INDEX);
-            }
-            else {
+            } else {
                 // Check if `it` is not going to be assigned.
                 switch (parser->current.type) {
-                  case PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL:
-                  case PM_TOKEN_AMPERSAND_EQUAL:
-                  case PM_TOKEN_CARET_EQUAL:
-                  case PM_TOKEN_EQUAL:
-                  case PM_TOKEN_GREATER_GREATER_EQUAL:
-                  case PM_TOKEN_LESS_LESS_EQUAL:
-                  case PM_TOKEN_MINUS_EQUAL:
-                  case PM_TOKEN_PARENTHESIS_RIGHT:
-                  case PM_TOKEN_PERCENT_EQUAL:
-                  case PM_TOKEN_PIPE_EQUAL:
-                  case PM_TOKEN_PIPE_PIPE_EQUAL:
-                  case PM_TOKEN_PLUS_EQUAL:
-                  case PM_TOKEN_SLASH_EQUAL:
-                  case PM_TOKEN_STAR_EQUAL:
-                  case PM_TOKEN_STAR_STAR_EQUAL:
-                    break;
-                  default:
-                    // Once we know it's neither a method call nor an assignment,
-                    // we can finally create `it` default parameter.
-                    node = pm_node_check_it(parser, node);
+                    case PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL:
+                    case PM_TOKEN_AMPERSAND_EQUAL:
+                    case PM_TOKEN_CARET_EQUAL:
+                    case PM_TOKEN_EQUAL:
+                    case PM_TOKEN_GREATER_GREATER_EQUAL:
+                    case PM_TOKEN_LESS_LESS_EQUAL:
+                    case PM_TOKEN_MINUS_EQUAL:
+                    case PM_TOKEN_PARENTHESIS_RIGHT:
+                    case PM_TOKEN_PERCENT_EQUAL:
+                    case PM_TOKEN_PIPE_EQUAL:
+                    case PM_TOKEN_PIPE_PIPE_EQUAL:
+                    case PM_TOKEN_PLUS_EQUAL:
+                    case PM_TOKEN_SLASH_EQUAL:
+                    case PM_TOKEN_STAR_EQUAL:
+                    case PM_TOKEN_STAR_STAR_EQUAL:
+                        break;
+                    default:
+                        // Once we know it's neither a method call nor an
+                        // assignment, we can finally create `it` default
+                        // parameter.
+                        node = pm_node_check_it(parser, node);
                 }
             }
 
@@ -14656,6 +14711,9 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
                 // If we get here, then we tried to find something in the
                 // heredoc but couldn't actually parse anything, so we'll just
                 // return a missing node.
+                //
+                // parse_string_part handles its own errors, so there is no need
+                // for us to add one here.
                 node = (pm_node_t *) pm_missing_node_create(parser, parser->previous.start, parser->previous.end);
             } else if (PM_NODE_TYPE_P(part, PM_STRING_NODE) && match2(parser, PM_TOKEN_HEREDOC_END, PM_TOKEN_EOF)) {
                 // If we get here, then the part that we parsed was plain string
@@ -16301,6 +16359,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
             // context of a multiple assignment. We enforce that here. We'll
             // still lex past it though and create a missing node place.
             if (binding_power != PM_BINDING_POWER_STATEMENT) {
+                pm_parser_err_previous(parser, diag_id);
                 return (pm_node_t *) pm_missing_node_create(parser, parser->previous.start, parser->previous.end);
             }
 
@@ -16487,12 +16546,34 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
 
             return parse_symbol(parser, &lex_mode, PM_LEX_STATE_END);
         }
-        default:
-            if (context_recoverable(parser, &parser->current)) {
+        default: {
+            pm_context_t recoverable = context_recoverable(parser, &parser->current);
+
+            if (recoverable != PM_CONTEXT_NONE) {
                 parser->recovering = true;
+
+                // If the given error is not the generic one, then we'll add it
+                // here because it will provide more context in addition to the
+                // recoverable error that we will also add.
+                if (diag_id != PM_ERR_CANNOT_PARSE_EXPRESSION) {
+                    pm_parser_err_previous(parser, diag_id);
+                }
+
+                // If we get here, then we are assuming this token is closing a
+                // parent context, so we'll indicate that to the user so that
+                // they know how we behaved.
+                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_UNEXPECTED_TOKEN_CLOSE_CONTEXT, pm_token_type_human(parser->current.type), context_human(recoverable));
+            } else if (diag_id == PM_ERR_CANNOT_PARSE_EXPRESSION) {
+                // We're going to make a special case here, because "cannot
+                // parse expression" is pretty generic, and we know here that we
+                // have an unexpected token.
+                PM_PARSER_ERR_TOKEN_FORMAT(parser, parser->current, PM_ERR_UNEXPECTED_TOKEN_IGNORE, pm_token_type_human(parser->current.type));
+            } else {
+                pm_parser_err_previous(parser, diag_id);
             }
 
             return (pm_node_t *) pm_missing_node_create(parser, parser->previous.start, parser->previous.end);
+        }
     }
 }
 
@@ -17455,15 +17536,12 @@ parse_expression_infix(pm_parser_t *parser, pm_node_t *node, pm_binding_power_t
  */
 static pm_node_t *
 parse_expression(pm_parser_t *parser, pm_binding_power_t binding_power, bool accepts_command_call, pm_diagnostic_id_t diag_id) {
-    pm_token_t recovery = parser->previous;
-    pm_node_t *node = parse_expression_prefix(parser, binding_power, accepts_command_call);
+    pm_node_t *node = parse_expression_prefix(parser, binding_power, accepts_command_call, diag_id);
 
     switch (PM_NODE_TYPE(node)) {
         case PM_MISSING_NODE:
             // If we found a syntax error, then the type of node returned by
-            // parse_expression_prefix is going to be a missing node. In that
-            // case we need to add the error message to the parser's error list.
-            pm_parser_err(parser, recovery.end, recovery.end, diag_id);
+            // parse_expression_prefix is going to be a missing node.
             return node;
         case PM_PRE_EXECUTION_NODE:
         case PM_POST_EXECUTION_NODE:
@@ -17472,7 +17550,7 @@ parse_expression(pm_parser_t *parser, pm_binding_power_t binding_power, bool acc
         case PM_UNDEF_NODE:
             // These expressions are statements, and cannot be followed by
             // operators (except modifiers).
-            if (pm_binding_powers[parser->current.type].left > PM_BINDING_POWER_MODIFIER_RESCUE) {
+            if (pm_binding_powers[parser->current.type].left > PM_BINDING_POWER_MODIFIER) {
                 return node;
             }
             break;
diff --git a/src/main/c/yarp/src/token_type.c b/src/main/c/yarp/src/token_type.c
index 1cb395bf12a2..c8400b343223 100644
--- a/src/main/c/yarp/src/token_type.c
+++ b/src/main/c/yarp/src/token_type.c
@@ -13,8 +13,7 @@
  * Returns a string representation of the given token type.
  */
 PRISM_EXPORTED_FUNCTION const char *
-pm_token_type_to_str(pm_token_type_t token_type)
-{
+pm_token_type_name(pm_token_type_t token_type) {
     switch (token_type) {
         case PM_TOKEN_EOF:
             return "EOF";
@@ -345,7 +344,357 @@ pm_token_type_to_str(pm_token_type_t token_type)
         case PM_TOKEN___END__:
             return "__END__";
         case PM_TOKEN_MAXIMUM:
-            return "MAXIMUM";
+            assert(false && "unreachable");
+            return "";
     }
-    return "\0";
+
+    // Provide a default, because some compilers can't determine that the above
+    // switch is exhaustive.
+    assert(false && "unreachable");
+    return "";
+}
+
+/**
+ * Returns the human name of the given token type.
+ */
+const char *
+pm_token_type_human(pm_token_type_t token_type) {
+    switch (token_type) {
+        case PM_TOKEN_EOF:
+            return "end of file";
+        case PM_TOKEN_MISSING:
+            return "missing token";
+        case PM_TOKEN_NOT_PROVIDED:
+            return "not provided token";
+        case PM_TOKEN_AMPERSAND:
+            return "'&'";
+        case PM_TOKEN_AMPERSAND_AMPERSAND:
+            return "'&&'";
+        case PM_TOKEN_AMPERSAND_AMPERSAND_EQUAL:
+            return "'&&='";
+        case PM_TOKEN_AMPERSAND_DOT:
+            return "'&.'";
+        case PM_TOKEN_AMPERSAND_EQUAL:
+            return "'&='";
+        case PM_TOKEN_BACKTICK:
+            return "'`'";
+        case PM_TOKEN_BACK_REFERENCE:
+            return "back reference";
+        case PM_TOKEN_BANG:
+            return "'!'";
+        case PM_TOKEN_BANG_EQUAL:
+            return "'!='";
+        case PM_TOKEN_BANG_TILDE:
+            return "'!~'";
+        case PM_TOKEN_BRACE_LEFT:
+            return "'{'";
+        case PM_TOKEN_BRACE_RIGHT:
+            return "'}'";
+        case PM_TOKEN_BRACKET_LEFT:
+            return "'['";
+        case PM_TOKEN_BRACKET_LEFT_ARRAY:
+            return "'['";
+        case PM_TOKEN_BRACKET_LEFT_RIGHT:
+            return "'[]'";
+        case PM_TOKEN_BRACKET_LEFT_RIGHT_EQUAL:
+            return "'[]='";
+        case PM_TOKEN_BRACKET_RIGHT:
+            return "']'";
+        case PM_TOKEN_CARET:
+            return "'^'";
+        case PM_TOKEN_CARET_EQUAL:
+            return "'^='";
+        case PM_TOKEN_CHARACTER_LITERAL:
+            return "character literal";
+        case PM_TOKEN_CLASS_VARIABLE:
+            return "class variable";
+        case PM_TOKEN_COLON:
+            return "':'";
+        case PM_TOKEN_COLON_COLON:
+            return "'::'";
+        case PM_TOKEN_COMMA:
+            return "','";
+        case PM_TOKEN_COMMENT:
+            return "comment";
+        case PM_TOKEN_CONSTANT:
+            return "constant";
+        case PM_TOKEN_DOT:
+            return "'.'";
+        case PM_TOKEN_DOT_DOT:
+            return "'..'";
+        case PM_TOKEN_DOT_DOT_DOT:
+            return "'...'";
+        case PM_TOKEN_EMBDOC_BEGIN:
+            return "'=begin'";
+        case PM_TOKEN_EMBDOC_END:
+            return "'=end'";
+        case PM_TOKEN_EMBDOC_LINE:
+            return "embedded documentation line";
+        case PM_TOKEN_EMBEXPR_BEGIN:
+            return "'#{'";
+        case PM_TOKEN_EMBEXPR_END:
+            return "'}'";
+        case PM_TOKEN_EMBVAR:
+            return "'#'";
+        case PM_TOKEN_EQUAL:
+            return "'='";
+        case PM_TOKEN_EQUAL_EQUAL:
+            return "'=='";
+        case PM_TOKEN_EQUAL_EQUAL_EQUAL:
+            return "'==='";
+        case PM_TOKEN_EQUAL_GREATER:
+            return "'=>'";
+        case PM_TOKEN_EQUAL_TILDE:
+            return "'=~'";
+        case PM_TOKEN_FLOAT:
+            return "float";
+        case PM_TOKEN_FLOAT_IMAGINARY:
+            return "imaginary";
+        case PM_TOKEN_FLOAT_RATIONAL:
+            return "rational";
+        case PM_TOKEN_FLOAT_RATIONAL_IMAGINARY:
+            return "imaginary";
+        case PM_TOKEN_GLOBAL_VARIABLE:
+            return "global variable";
+        case PM_TOKEN_GREATER:
+            return "'>'";
+        case PM_TOKEN_GREATER_EQUAL:
+            return "'>='";
+        case PM_TOKEN_GREATER_GREATER:
+            return "'>>'";
+        case PM_TOKEN_GREATER_GREATER_EQUAL:
+            return "'>>='";
+        case PM_TOKEN_HEREDOC_END:
+            return "heredoc ending";
+        case PM_TOKEN_HEREDOC_START:
+            return "heredoc beginning";
+        case PM_TOKEN_IDENTIFIER:
+            return "local variable or method identifier";
+        case PM_TOKEN_IGNORED_NEWLINE:
+            return "ignored newline";
+        case PM_TOKEN_INSTANCE_VARIABLE:
+            return "instance variable";
+        case PM_TOKEN_INTEGER:
+            return "integer";
+        case PM_TOKEN_INTEGER_IMAGINARY:
+            return "imaginary";
+        case PM_TOKEN_INTEGER_RATIONAL:
+            return "rational";
+        case PM_TOKEN_INTEGER_RATIONAL_IMAGINARY:
+            return "imaginary";
+        case PM_TOKEN_KEYWORD_ALIAS:
+            return "'alias'";
+        case PM_TOKEN_KEYWORD_AND:
+            return "'and'";
+        case PM_TOKEN_KEYWORD_BEGIN:
+            return "'begin'";
+        case PM_TOKEN_KEYWORD_BEGIN_UPCASE:
+            return "'BEGIN'";
+        case PM_TOKEN_KEYWORD_BREAK:
+            return "'break'";
+        case PM_TOKEN_KEYWORD_CASE:
+            return "'case'";
+        case PM_TOKEN_KEYWORD_CLASS:
+            return "'class'";
+        case PM_TOKEN_KEYWORD_DEF:
+            return "'def'";
+        case PM_TOKEN_KEYWORD_DEFINED:
+            return "'defined?'";
+        case PM_TOKEN_KEYWORD_DO:
+            return "'do'";
+        case PM_TOKEN_KEYWORD_DO_LOOP:
+            return "'do'";
+        case PM_TOKEN_KEYWORD_ELSE:
+            return "'else'";
+        case PM_TOKEN_KEYWORD_ELSIF:
+            return "'elsif'";
+        case PM_TOKEN_KEYWORD_END:
+            return "'end'";
+        case PM_TOKEN_KEYWORD_END_UPCASE:
+            return "'END'";
+        case PM_TOKEN_KEYWORD_ENSURE:
+            return "'ensure'";
+        case PM_TOKEN_KEYWORD_FALSE:
+            return "'false'";
+        case PM_TOKEN_KEYWORD_FOR:
+            return "'for'";
+        case PM_TOKEN_KEYWORD_IF:
+            return "'if'";
+        case PM_TOKEN_KEYWORD_IF_MODIFIER:
+            return "'if'";
+        case PM_TOKEN_KEYWORD_IN:
+            return "'in'";
+        case PM_TOKEN_KEYWORD_MODULE:
+            return "'module'";
+        case PM_TOKEN_KEYWORD_NEXT:
+            return "'next'";
+        case PM_TOKEN_KEYWORD_NIL:
+            return "'nil'";
+        case PM_TOKEN_KEYWORD_NOT:
+            return "'not'";
+        case PM_TOKEN_KEYWORD_OR:
+            return "'or'";
+        case PM_TOKEN_KEYWORD_REDO:
+            return "'redo'";
+        case PM_TOKEN_KEYWORD_RESCUE:
+            return "'rescue'";
+        case PM_TOKEN_KEYWORD_RESCUE_MODIFIER:
+            return "'rescue'";
+        case PM_TOKEN_KEYWORD_RETRY:
+            return "'retry'";
+        case PM_TOKEN_KEYWORD_RETURN:
+            return "'return'";
+        case PM_TOKEN_KEYWORD_SELF:
+            return "'self'";
+        case PM_TOKEN_KEYWORD_SUPER:
+            return "'super'";
+        case PM_TOKEN_KEYWORD_THEN:
+            return "'then'";
+        case PM_TOKEN_KEYWORD_TRUE:
+            return "'true'";
+        case PM_TOKEN_KEYWORD_UNDEF:
+            return "'undef'";
+        case PM_TOKEN_KEYWORD_UNLESS:
+            return "'unless'";
+        case PM_TOKEN_KEYWORD_UNLESS_MODIFIER:
+            return "'unless'";
+        case PM_TOKEN_KEYWORD_UNTIL:
+            return "'until'";
+        case PM_TOKEN_KEYWORD_UNTIL_MODIFIER:
+            return "'until'";
+        case PM_TOKEN_KEYWORD_WHEN:
+            return "'when'";
+        case PM_TOKEN_KEYWORD_WHILE:
+            return "'while'";
+        case PM_TOKEN_KEYWORD_WHILE_MODIFIER:
+            return "'while'";
+        case PM_TOKEN_KEYWORD_YIELD:
+            return "'yield'";
+        case PM_TOKEN_KEYWORD___ENCODING__:
+            return "'__ENCODING__'";
+        case PM_TOKEN_KEYWORD___FILE__:
+            return "'__FILE__'";
+        case PM_TOKEN_KEYWORD___LINE__:
+            return "'__LINE__'";
+        case PM_TOKEN_LABEL:
+            return "label";
+        case PM_TOKEN_LABEL_END:
+            return "':'";
+        case PM_TOKEN_LAMBDA_BEGIN:
+            return "'{'";
+        case PM_TOKEN_LESS:
+            return "'<'";
+        case PM_TOKEN_LESS_EQUAL:
+            return "'<='";
+        case PM_TOKEN_LESS_EQUAL_GREATER:
+            return "'<=>'";
+        case PM_TOKEN_LESS_LESS:
+            return "'<<'";
+        case PM_TOKEN_LESS_LESS_EQUAL:
+            return "'<<='";
+        case PM_TOKEN_METHOD_NAME:
+            return "method name";
+        case PM_TOKEN_MINUS:
+            return "'-'";
+        case PM_TOKEN_MINUS_EQUAL:
+            return "'-='";
+        case PM_TOKEN_MINUS_GREATER:
+            return "'->'";
+        case PM_TOKEN_NEWLINE:
+            return "newline";
+        case PM_TOKEN_NUMBERED_REFERENCE:
+            return "numbered reference";
+        case PM_TOKEN_PARENTHESIS_LEFT:
+            return "'('";
+        case PM_TOKEN_PARENTHESIS_LEFT_PARENTHESES:
+            return "'('";
+        case PM_TOKEN_PARENTHESIS_RIGHT:
+            return "')'";
+        case PM_TOKEN_PERCENT:
+            return "'%'";
+        case PM_TOKEN_PERCENT_EQUAL:
+            return "'%='";
+        case PM_TOKEN_PERCENT_LOWER_I:
+            return "'%i'";
+        case PM_TOKEN_PERCENT_LOWER_W:
+            return "'%w'";
+        case PM_TOKEN_PERCENT_LOWER_X:
+            return "'%x'";
+        case PM_TOKEN_PERCENT_UPPER_I:
+            return "'%I'";
+        case PM_TOKEN_PERCENT_UPPER_W:
+            return "'%W'";
+        case PM_TOKEN_PIPE:
+            return "'|'";
+        case PM_TOKEN_PIPE_EQUAL:
+            return "'|='";
+        case PM_TOKEN_PIPE_PIPE:
+            return "'||'";
+        case PM_TOKEN_PIPE_PIPE_EQUAL:
+            return "'||='";
+        case PM_TOKEN_PLUS:
+            return "'+'";
+        case PM_TOKEN_PLUS_EQUAL:
+            return "'+='";
+        case PM_TOKEN_QUESTION_MARK:
+            return "'?'";
+        case PM_TOKEN_REGEXP_BEGIN:
+            return "regular expression beginning";
+        case PM_TOKEN_REGEXP_END:
+            return "regular expression ending";
+        case PM_TOKEN_SEMICOLON:
+            return "';'";
+        case PM_TOKEN_SLASH:
+            return "'/'";
+        case PM_TOKEN_SLASH_EQUAL:
+            return "'/='";
+        case PM_TOKEN_STAR:
+            return "'*'";
+        case PM_TOKEN_STAR_EQUAL:
+            return "'*='";
+        case PM_TOKEN_STAR_STAR:
+            return "'**'";
+        case PM_TOKEN_STAR_STAR_EQUAL:
+            return "'**='";
+        case PM_TOKEN_STRING_BEGIN:
+            return "string beginning";
+        case PM_TOKEN_STRING_CONTENT:
+            return "string content";
+        case PM_TOKEN_STRING_END:
+            return "string ending";
+        case PM_TOKEN_SYMBOL_BEGIN:
+            return "symbol beginning";
+        case PM_TOKEN_TILDE:
+            return "'~'";
+        case PM_TOKEN_UAMPERSAND:
+            return "'&'";
+        case PM_TOKEN_UCOLON_COLON:
+            return "'::'";
+        case PM_TOKEN_UDOT_DOT:
+            return "'..'";
+        case PM_TOKEN_UDOT_DOT_DOT:
+            return "'...'";
+        case PM_TOKEN_UMINUS:
+            return "'-'";
+        case PM_TOKEN_UMINUS_NUM:
+            return "'-'";
+        case PM_TOKEN_UPLUS:
+            return "'+'";
+        case PM_TOKEN_USTAR:
+            return "'*'";
+        case PM_TOKEN_USTAR_STAR:
+            return "'**'";
+        case PM_TOKEN_WORDS_SEP:
+            return "string separator";
+        case PM_TOKEN___END__:
+            return "'__END__'";
+        case PM_TOKEN_MAXIMUM:
+            assert(false && "unreachable");
+            return "";
+    }
+
+    // Provide a default, because some compilers can't determine that the above
+    // switch is exhaustive.
+    assert(false && "unreachable");
+    return "";
 }

From 2f1659987b900092677f06df45bbfab721f84f47 Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 30 Jan 2024 17:32:42 +0100
Subject: [PATCH 130/131] Revert "Workaround
 https://github.com/ruby/prism/issues/2289"

This reverts commit 6769f95732463e8e5f89ad95814b2fe8afe59144.
---
 test/mri/tests/ruby/test_process.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/mri/tests/ruby/test_process.rb b/test/mri/tests/ruby/test_process.rb
index 4d01d3eda39e..1d04d22631b9 100644
--- a/test/mri/tests/ruby/test_process.rb
+++ b/test/mri/tests/ruby/test_process.rb
@@ -1823,12 +1823,7 @@ def test_system_sigpipe
       end
     end
   ensure
-    # https://github.com/ruby/prism/issues/2289
-    # Process.kill(:KILL, pid) if (pid != 0) rescue false
-    begin
-      Process.kill(:KILL, pid) if (pid != 0)
-    rescue Errno::ESRCH
-    end
+    Process.kill(:KILL, pid) if (pid != 0) rescue false
   end
 
   if Process.respond_to?(:daemon)

From 9b405d7b16e6ee4aef85f992342103ef6fb4b73c Mon Sep 17 00:00:00 2001
From: Benoit Daloze 
Date: Tue, 30 Jan 2024 17:37:31 +0100
Subject: [PATCH 131/131] Update to latest Prism syntax error messages

---
 spec/ruby/language/pattern_matching_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/ruby/language/pattern_matching_spec.rb b/spec/ruby/language/pattern_matching_spec.rb
index 368910b9f738..8b408ecb8e1a 100644
--- a/spec/ruby/language/pattern_matching_spec.rb
+++ b/spec/ruby/language/pattern_matching_spec.rb
@@ -207,7 +207,7 @@
         in []
         end
       RUBY
-    }.should raise_error(SyntaxError, /syntax error, unexpected `in'|\(eval\):3: syntax error, unexpected keyword_in|cannot parse the expression/)
+    }.should raise_error(SyntaxError, /syntax error, unexpected `in'|\(eval\):3: syntax error, unexpected keyword_in|unexpected 'in'/)
 
     -> {
       eval <<~RUBY
@@ -216,7 +216,7 @@
         when 1 == 1
         end
       RUBY
-    }.should raise_error(SyntaxError, /syntax error, unexpected `when'|\(eval\):3: syntax error, unexpected keyword_when|cannot parse the expression/)
+    }.should raise_error(SyntaxError, /syntax error, unexpected `when'|\(eval\):3: syntax error, unexpected keyword_when|unexpected 'when'/)
   end
 
   it "checks patterns until the first matching" do