1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/prism] Split KeywordParameterNode into Optional and Required

Browse Source 
Prior to this commit, KeywordParameterNode included both optional
and required keywords. With this commit, it is split in two, with
`OptionalKeywordParameterNode`s no longer having a value field.

https://github.com/ruby/prism/commit/89084d9af4
This commit is contained in:
Jemma Issroff 2023-10-31 17:00:28 -03:00 committed by git
parent 717fb5bb0b
commit d0625099e0
37 changed files with 174 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/prism/debug.rb
View File

@ -114,8 +114,8 @@ module Prism
AnonymousLocal
end
end,
*params.keywords.reject(&:value).map(&:name),
*params.keywords.select(&:value).map(&:name)
*params.keywords.select { |kw| kw.is_a? OptionalKeywordParameterNode }.map(&:name),
*params.keywords.select { |kw| kw.is_a? RequiredKeywordParameterNode }.map(&:name),
]
sorted << AnonymousLocal if params.keywords.any?

44
prism/config.yml
View File

@ -1692,24 +1692,6 @@ nodes:
foo(a: b)
^^^^
- name: KeywordParameterNode
fields:
- name: name
type: constant
- name: name_loc
type: location
- name: value
type: node?
comment: |
Represents a keyword parameter to a method, block, or lambda definition.
def a(b:)
^^
end
def a(b: 1)
^^^^
end
- name: KeywordRestParameterNode
fields:
- name: name
@ -1997,6 +1979,18 @@ nodes:
$1
^^
- name: OptionalKeywordParameterNode
fields:
- name: name
type: constant
- name: name_loc
type: location
comment: |
Represents an optional keyword parameter to a method, block, or lambda definition.
def a(b: )
^^
end
- name: OptionalParameterNode
fields:
- name: name
@ -2184,6 +2178,20 @@ nodes:
/foo/i
^^^^^^
- name: RequiredKeywordParameterNode
fields:
- name: name
type: constant
- name: name_loc
type: location
- name: value
type: node
comment: |
Represents a required keyword parameter to a method, block, or lambda definition.
def a(b: 1)
^^^^
end
- name: RequiredParameterNode
fields:
- name: name

48
prism/prism.c
View File

@ -3326,17 +3326,37 @@ pm_keyword_hash_node_elements_append(pm_keyword_hash_node_t *hash, pm_node_t *el
hash->base.location.end = element->location.end;
}
// Allocate a new KeywordParameterNode node.
static pm_keyword_parameter_node_t *
pm_keyword_parameter_node_create(pm_parser_t *parser, const pm_token_t *name, pm_node_t *value) {
pm_keyword_parameter_node_t *node = PM_ALLOC_NODE(parser, pm_keyword_parameter_node_t);
// Allocate a new OptionalKeywordParameterNode node.
static pm_optional_keyword_parameter_node_t *
pm_optional_keyword_parameter_node_create(pm_parser_t *parser, const pm_token_t *name) {
pm_optional_keyword_parameter_node_t *node = PM_ALLOC_NODE(parser, pm_optional_keyword_parameter_node_t);
*node = (pm_keyword_parameter_node_t) {
*node = (pm_optional_keyword_parameter_node_t) {
{
.type = PM_KEYWORD_PARAMETER_NODE,
.type = PM_OPTIONAL_KEYWORD_PARAMETER_NODE,
.location = {
.start = name->start,
.end = value == NULL ? name->end : value->location.end
.end = name->end
},
},
.name = pm_parser_constant_id_location(parser, name->start, name->end - 1),
.name_loc = PM_LOCATION_TOKEN_VALUE(name),
};
return node;
}
// Allocate a new RequiredKeywordParameterNode node.
static pm_required_keyword_parameter_node_t *
pm_required_keyword_parameter_node_create(pm_parser_t *parser, const pm_token_t *name, pm_node_t *value) {
pm_required_keyword_parameter_node_t *node = PM_ALLOC_NODE(parser, pm_required_keyword_parameter_node_t);
*node = (pm_required_keyword_parameter_node_t) {
{
.type = PM_REQUIRED_KEYWORD_PARAMETER_NODE,
.location = {
.start = name->start,
.end = value->location.end
},
},
.name = pm_parser_constant_id_location(parser, name->start, name->end - 1),
@ -10482,7 +10502,7 @@ parse_parameters(
case PM_TOKEN_COMMA:
case PM_TOKEN_PARENTHESIS_RIGHT:
case PM_TOKEN_PIPE: {
pm_node_t *param = (pm_node_t *) pm_keyword_parameter_node_create(parser, &name, NULL);
pm_node_t *param = (pm_node_t *) pm_optional_keyword_parameter_node_create(parser, &name);
pm_parameters_node_keywords_append(params, param);
break;
}
@ -10493,19 +10513,23 @@ parse_parameters(
break;
}
pm_node_t *param = (pm_node_t *) pm_keyword_parameter_node_create(parser, &name, NULL);
pm_node_t *param = (pm_node_t *) pm_optional_keyword_parameter_node_create(parser, &name);
pm_parameters_node_keywords_append(params, param);
break;
}
default: {
pm_node_t *value = NULL;
pm_node_t *param;
if (token_begins_expression_p(parser->current.type)) {
context_push(parser, PM_CONTEXT_DEFAULT_PARAMS);
value = parse_expression(parser, binding_power, PM_ERR_PARAMETER_NO_DEFAULT_KW);
pm_node_t *value = parse_expression(parser, binding_power, PM_ERR_PARAMETER_NO_DEFAULT_KW);
context_pop(parser);
param = (pm_node_t *) pm_required_keyword_parameter_node_create(parser, &name, value);
}
else {
param = (pm_node_t *) pm_optional_keyword_parameter_node_create(parser, &name);
}
pm_node_t *param = (pm_node_t *) pm_keyword_parameter_node_create(parser, &name, value);
pm_parameters_node_keywords_append(params, param);
// If parsing the value of the parameter resulted in error recovery,

10
test/prism/errors_test.rb
View File

@ -746,7 +746,7 @@ module Prism
[],
nil,
[RequiredParameterNode(:a)],
[KeywordParameterNode(:b, Location(), nil)],
[OptionalKeywordParameterNode(:b, Location())],
nil,
nil
),
@ -774,7 +774,7 @@ module Prism
[],
nil,
[],
[KeywordParameterNode(:b, Location(), nil)],
[OptionalKeywordParameterNode(:b, Location())],
KeywordRestParameterNode(:rest, Location(), Location()),
nil
),
@ -824,7 +824,7 @@ module Prism
[],
nil,
[RequiredParameterNode(:a)],
[KeywordParameterNode(:b, Location(), nil)],
[OptionalKeywordParameterNode(:b, Location())],
KeywordRestParameterNode(:args, Location(), Location()),
nil
),
@ -854,7 +854,7 @@ module Prism
[],
nil,
[RequiredParameterNode(:a)],
[KeywordParameterNode(:b, Location(), nil)],
[OptionalKeywordParameterNode(:b, Location())],
KeywordRestParameterNode(:args, Location(), Location()),
nil
),
@ -884,7 +884,7 @@ module Prism
[],
nil,
[RequiredParameterNode(:a)],
[KeywordParameterNode(:b, Location(), nil)],
[OptionalKeywordParameterNode(:b, Location())],
KeywordRestParameterNode(:args, Location(), Location()),
nil
),

22
test/prism/location_test.rb
View File

@ -502,16 +502,6 @@ module Prism
assert_location(KeywordHashNode, "foo(a, b: 1)", 7...11) { |node| node.arguments.arguments[1] }
end
def test_KeywordParameterNode
assert_location(KeywordParameterNode, "def foo(bar:); end", 8...12) do |node|
node.parameters.keywords.first
end
assert_location(KeywordParameterNode, "def foo(bar: nil); end", 8...16) do |node|
node.parameters.keywords.first
end
end
def test_KeywordRestParameterNode
assert_location(KeywordRestParameterNode, "def foo(**); end", 8...10) do |node|
node.parameters.keyword_rest
@ -609,6 +599,12 @@ module Prism
assert_location(NumberedReferenceReadNode, "$1")
end
def test_OptionalKeywordParameterNode
assert_location(OptionalKeywordParameterNode, "def foo(bar:); end", 8...12) do |node|
node.parameters.keywords.first
end
end
def test_OptionalParameterNode
assert_location(OptionalParameterNode, "def foo(bar = nil); end", 8...17) do |node|
node.parameters.optionals.first
@ -673,6 +669,12 @@ module Prism
assert_location(RegularExpressionNode, "/foo/")
end
def test_RequiredKeywordParameterNode
assert_location(RequiredKeywordParameterNode, "def foo(bar: nil); end", 8...16) do |node|
node.parameters.keywords.first
end
end
def test_RequiredParameterNode
assert_location(RequiredParameterNode, "def foo(bar); end", 8...11) do |node|
node.parameters.requireds.first

9
test/prism/snapshots/blocks.txt
View File

@ -517,10 +517,9 @@
│ │ │ │ ├── rest: ∅
│ │ │ │ ├── posts: (length: 0)
│ │ │ │ ├── keywords: (length: 1)
│ │ │ │ │ └── @ KeywordParameterNode (location: (33,17)-(33,19))
│ │ │ │ │ └── @ OptionalKeywordParameterNode (location: (33,17)-(33,19))
│ │ │ │ │ ├── name: :z
│ │ │ │ │ ├── name_loc: (33,17)-(33,19) = "z:"
│ │ │ │ │ └── value: ∅
│ │ │ │ │ └── name_loc: (33,17)-(33,19) = "z:"
│ │ │ │ ├── keyword_rest: ∅
│ │ │ │ └── block: ∅
│ │ │ ├── locals: (length: 0)
@ -696,13 +695,13 @@
│ │ │ │ │ │ ├── rest: ∅
│ │ │ │ │ │ ├── posts: (length: 0)
│ │ │ │ │ │ ├── keywords: (length: 2)
│ │ │ │ │ │ │ ├── @ KeywordParameterNode (location: (49,2)-(49,6))
│ │ │ │ │ │ │ ├── @ RequiredKeywordParameterNode (location: (49,2)-(49,6))
│ │ │ │ │ │ │ │ ├── name: :a
│ │ │ │ │ │ │ │ ├── name_loc: (49,2)-(49,4) = "a:"
│ │ │ │ │ │ │ │ └── value:
│ │ │ │ │ │ │ │ @ IntegerNode (location: (49,5)-(49,6))
│ │ │ │ │ │ │ │ └── flags: decimal
│ │ │ │ │ │ │ └── @ KeywordParameterNode (location: (50,2)-(50,6))
│ │ │ │ │ │ │ └── @ RequiredKeywordParameterNode (location: (50,2)-(50,6))
│ │ │ │ │ │ │ ├── name: :b
│ │ │ │ │ │ │ ├── name_loc: (50,2)-(50,4) = "b:"
│ │ │ │ │ │ │ └── value:

6
test/prism/snapshots/lambda.txt
View File

@ -39,7 +39,7 @@
│ │ │ ├── rest: ∅
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 1)
│ │ │ │ └── @ KeywordParameterNode (location: (5,3)-(5,13))
│ │ │ │ └── @ RequiredKeywordParameterNode (location: (5,3)-(5,13))
│ │ │ │ ├── name: :x
│ │ │ │ ├── name_loc: (5,3)-(5,5) = "x:"
│ │ │ │ └── value:
@ -89,7 +89,7 @@
│ │ │ ├── rest: ∅
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 1)
│ │ │ │ └── @ KeywordParameterNode (location: (7,3)-(7,11))
│ │ │ │ └── @ RequiredKeywordParameterNode (location: (7,3)-(7,11))
│ │ │ │ ├── name: :a
│ │ │ │ ├── name_loc: (7,3)-(7,5) = "a:"
│ │ │ │ └── value:
@ -173,7 +173,7 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (11,3)-(11,11))
│ │ │ └── @ RequiredKeywordParameterNode (location: (11,3)-(11,11))
│ │ │ ├── name: :foo
│ │ │ ├── name_loc: (11,3)-(11,7) = "foo:"
│ │ │ └── value:

37
test/prism/snapshots/methods.txt
View File

@ -260,10 +260,9 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (31,6)-(31,8))
│ │ │ └── @ OptionalKeywordParameterNode (location: (31,6)-(31,8))
│ │ │ ├── name: :b
│ │ │ ├── name_loc: (31,6)-(31,8) = "b:"
│ │ │ └── value: ∅
│ │ │ └── name_loc: (31,6)-(31,8) = "b:"
│ │ ├── keyword_rest: ∅
│ │ └── block: ∅
│ ├── body: ∅
@ -291,10 +290,9 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (35,6)-(35,8))
│ │ │ └── @ OptionalKeywordParameterNode (location: (35,6)-(35,8))
│ │ │ ├── name: :b
│ │ │ ├── name_loc: (35,6)-(35,8) = "b:"
│ │ │ └── value: ∅
│ │ │ └── name_loc: (35,6)-(35,8) = "b:"
│ │ ├── keyword_rest: ∅
│ │ └── block: ∅
│ ├── body: ∅
@ -428,11 +426,10 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 2)
│ │ │ ├── @ KeywordParameterNode (location: (53,6)-(53,8))
│ │ │ ├── @ OptionalKeywordParameterNode (location: (53,6)-(53,8))
│ │ │ │ ├── name: :b
│ │ │ │ ├── name_loc: (53,6)-(53,8) = "b:"
│ │ │ │ └── value: ∅
│ │ │ └── @ KeywordParameterNode (location: (53,10)-(53,14))
│ │ │ │ └── name_loc: (53,6)-(53,8) = "b:"
│ │ │ └── @ RequiredKeywordParameterNode (location: (53,10)-(53,14))
│ │ │ ├── name: :c
│ │ │ ├── name_loc: (53,10)-(53,12) = "c:"
│ │ │ └── value:
@ -459,11 +456,10 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 2)
│ │ │ ├── @ KeywordParameterNode (location: (56,6)-(56,8))
│ │ │ ├── @ OptionalKeywordParameterNode (location: (56,6)-(56,8))
│ │ │ │ ├── name: :b
│ │ │ │ ├── name_loc: (56,6)-(56,8) = "b:"
│ │ │ │ └── value: ∅
│ │ │ └── @ KeywordParameterNode (location: (56,10)-(56,14))
│ │ │ │ └── name_loc: (56,6)-(56,8) = "b:"
│ │ │ └── @ RequiredKeywordParameterNode (location: (56,10)-(56,14))
│ │ │ ├── name: :c
│ │ │ ├── name_loc: (56,10)-(56,12) = "c:"
│ │ │ └── value:
@ -490,16 +486,15 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 2)
│ │ │ ├── @ KeywordParameterNode (location: (59,6)-(60,3))
│ │ │ ├── @ RequiredKeywordParameterNode (location: (59,6)-(60,3))
│ │ │ │ ├── name: :b
│ │ │ │ ├── name_loc: (59,6)-(59,8) = "b:"
│ │ │ │ └── value:
│ │ │ │ @ IntegerNode (location: (60,2)-(60,3))
│ │ │ │ └── flags: decimal
│ │ │ └── @ KeywordParameterNode (location: (60,5)-(60,7))
│ │ │ └── @ OptionalKeywordParameterNode (location: (60,5)-(60,7))
│ │ │ ├── name: :c
│ │ │ ├── name_loc: (60,5)-(60,7) = "c:"
│ │ │ └── value: ∅
│ │ │ └── name_loc: (60,5)-(60,7) = "c:"
│ │ ├── keyword_rest: ∅
│ │ └── block: ∅
│ ├── body: ∅
@ -1312,7 +1307,7 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (142,8)-(142,19))
│ │ │ └── @ RequiredKeywordParameterNode (location: (142,8)-(142,19))
│ │ │ ├── name: :a
│ │ │ ├── name_loc: (142,8)-(142,10) = "a:"
│ │ │ └── value:
@ -1352,7 +1347,7 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (145,8)-(145,18))
│ │ │ └── @ RequiredKeywordParameterNode (location: (145,8)-(145,18))
│ │ │ ├── name: :a
│ │ │ ├── name_loc: (145,8)-(145,10) = "a:"
│ │ │ └── value:
@ -1390,7 +1385,7 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (148,8)-(148,17))
│ │ │ └── @ RequiredKeywordParameterNode (location: (148,8)-(148,17))
│ │ │ ├── name: :a
│ │ │ ├── name_loc: (148,8)-(148,10) = "a:"
│ │ │ └── value:

30
test/prism/snapshots/procs.txt
View File

@ -144,14 +144,12 @@
│ │ │ ├── rest: ∅
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 2)
│ │ │ │ ├── @ KeywordParameterNode (location: (17,13)-(17,15))
│ │ │ │ ├── @ OptionalKeywordParameterNode (location: (17,13)-(17,15))
│ │ │ │ │ ├── name: :c
│ │ │ │ │ ├── name_loc: (17,13)-(17,15) = "c:"
│ │ │ │ │ └── value: ∅
│ │ │ │ └── @ KeywordParameterNode (location: (17,17)-(17,19))
│ │ │ │ │ └── name_loc: (17,13)-(17,15) = "c:"
│ │ │ │ └── @ OptionalKeywordParameterNode (location: (17,17)-(17,19))
│ │ │ │ ├── name: :d
│ │ │ │ ├── name_loc: (17,17)-(17,19) = "d:"
│ │ │ │ └── value: ∅
│ │ │ │ └── name_loc: (17,17)-(17,19) = "d:"
│ │ │ ├── keyword_rest: ∅
│ │ │ └── block:
│ │ │ @ BlockParameterNode (location: (17,21)-(17,23))
@ -194,14 +192,12 @@
│ │ │ │ └── operator_loc: (19,14)-(19,15) = "*"
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 2)
│ │ │ │ ├── @ KeywordParameterNode (location: (19,18)-(19,20))
│ │ │ │ ├── @ OptionalKeywordParameterNode (location: (19,18)-(19,20))
│ │ │ │ │ ├── name: :d
│ │ │ │ │ ├── name_loc: (19,18)-(19,20) = "d:"
│ │ │ │ │ └── value: ∅
│ │ │ │ └── @ KeywordParameterNode (location: (19,22)-(19,24))
│ │ │ │ │ └── name_loc: (19,18)-(19,20) = "d:"
│ │ │ │ └── @ OptionalKeywordParameterNode (location: (19,22)-(19,24))
│ │ │ │ ├── name: :e
│ │ │ │ ├── name_loc: (19,22)-(19,24) = "e:"
│ │ │ │ └── value: ∅
│ │ │ │ └── name_loc: (19,22)-(19,24) = "e:"
│ │ │ ├── keyword_rest:
│ │ │ │ @ KeywordRestParameterNode (location: (19,26)-(19,29))
│ │ │ │ ├── name: :f
@ -248,14 +244,12 @@
│ │ │ │ └── operator_loc: (21,14)-(21,15) = "*"
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 2)
│ │ │ │ ├── @ KeywordParameterNode (location: (21,18)-(21,20))
│ │ │ │ ├── @ OptionalKeywordParameterNode (location: (21,18)-(21,20))
│ │ │ │ │ ├── name: :d
│ │ │ │ │ ├── name_loc: (21,18)-(21,20) = "d:"
│ │ │ │ │ └── value: ∅
│ │ │ │ └── @ KeywordParameterNode (location: (21,22)-(21,24))
│ │ │ │ │ └── name_loc: (21,18)-(21,20) = "d:"
│ │ │ │ └── @ OptionalKeywordParameterNode (location: (21,22)-(21,24))
│ │ │ │ ├── name: :e
│ │ │ │ ├── name_loc: (21,22)-(21,24) = "e:"
│ │ │ │ └── value: ∅
│ │ │ │ └── name_loc: (21,22)-(21,24) = "e:"
│ │ │ ├── keyword_rest:
│ │ │ │ @ KeywordRestParameterNode (location: (21,26)-(21,29))
│ │ │ │ ├── name: :f

2
test/prism/snapshots/seattlerb/args_kw_block.txt
View File

@ -14,7 +14,7 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,6)-(1,10))
│ │ └── @ RequiredKeywordParameterNode (location: (1,6)-(1,10))
│ │ ├── name: :a
│ │ ├── name_loc: (1,6)-(1,8) = "a:"
│ │ └── value:

2
test/prism/snapshots/seattlerb/block_kw.txt
View File

@ -22,7 +22,7 @@
│ │ │ ├── rest: ∅
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 1)
│ │ │ │ └── @ KeywordParameterNode (location: (1,8)-(1,12))
│ │ │ │ └── @ RequiredKeywordParameterNode (location: (1,8)-(1,12))
│ │ │ │ ├── name: :k
│ │ │ │ ├── name_loc: (1,8)-(1,10) = "k:"
│ │ │ │ └── value:

5
test/prism/snapshots/seattlerb/block_kw__required.txt
View File

@ -22,10 +22,9 @@
│ │ │ ├── rest: ∅
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 1)
│ │ │ │ └── @ KeywordParameterNode (location: (1,9)-(1,11))
│ │ │ │ └── @ OptionalKeywordParameterNode (location: (1,9)-(1,11))
│ │ │ │ ├── name: :k
│ │ │ │ ├── name_loc: (1,9)-(1,11) = "k:"
│ │ │ │ └── value: ∅
│ │ │ │ └── name_loc: (1,9)-(1,11) = "k:"
│ │ │ ├── keyword_rest: ∅
│ │ │ └── block: ∅
│ │ ├── locals: (length: 0)

2
test/prism/snapshots/seattlerb/block_kwarg_lvar.txt
View File

@ -22,7 +22,7 @@
│ │ │ ├── rest: ∅
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 1)
│ │ │ │ └── @ KeywordParameterNode (location: (1,6)-(1,14))
│ │ │ │ └── @ RequiredKeywordParameterNode (location: (1,6)-(1,14))
│ │ │ │ ├── name: :kw
│ │ │ │ ├── name_loc: (1,6)-(1,9) = "kw:"
│ │ │ │ └── value:

4
test/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
View File

@ -22,7 +22,7 @@
│ │ │ ├── rest: ∅
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 2)
│ │ │ │ ├── @ KeywordParameterNode (location: (1,6)-(1,14))
│ │ │ │ ├── @ RequiredKeywordParameterNode (location: (1,6)-(1,14))
│ │ │ │ │ ├── name: :kw
│ │ │ │ │ ├── name_loc: (1,6)-(1,9) = "kw:"
│ │ │ │ │ └── value:
@ -31,7 +31,7 @@
│ │ │ │ │ ├── value_loc: (1,11)-(1,14) = "val"
│ │ │ │ │ ├── closing_loc: ∅
│ │ │ │ │ └── unescaped: "val"
│ │ │ │ └── @ KeywordParameterNode (location: (1,16)-(1,26))
│ │ │ │ └── @ RequiredKeywordParameterNode (location: (1,16)-(1,26))
│ │ │ │ ├── name: :kw2
│ │ │ │ ├── name_loc: (1,16)-(1,20) = "kw2:"
│ │ │ │ └── value:

4
test/prism/snapshots/seattlerb/defn_kwarg_kwarg.txt
View File

@ -16,13 +16,13 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 2)
│ │ ├── @ KeywordParameterNode (location: (1,9)-(1,13))
│ │ ├── @ RequiredKeywordParameterNode (location: (1,9)-(1,13))
│ │ │ ├── name: :b
│ │ │ ├── name_loc: (1,9)-(1,11) = "b:"
│ │ │ └── value:
│ │ │ @ IntegerNode (location: (1,12)-(1,13))
│ │ │ └── flags: decimal
│ │ └── @ KeywordParameterNode (location: (1,15)-(1,19))
│ │ └── @ RequiredKeywordParameterNode (location: (1,15)-(1,19))
│ │ ├── name: :c
│ │ ├── name_loc: (1,15)-(1,17) = "c:"
│ │ └── value:

2
test/prism/snapshots/seattlerb/defn_kwarg_kwsplat.txt
View File

@ -14,7 +14,7 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,6)-(1,10))
│ │ └── @ RequiredKeywordParameterNode (location: (1,6)-(1,10))
│ │ ├── name: :b
│ │ ├── name_loc: (1,6)-(1,8) = "b:"
│ │ └── value:

2
test/prism/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt
View File

@ -14,7 +14,7 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,6)-(1,10))
│ │ └── @ RequiredKeywordParameterNode (location: (1,6)-(1,10))
│ │ ├── name: :b
│ │ ├── name_loc: (1,6)-(1,8) = "b:"
│ │ └── value:

2
test/prism/snapshots/seattlerb/defn_kwarg_lvar.txt
View File

@ -14,7 +14,7 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,8)-(1,16))
│ │ └── @ RequiredKeywordParameterNode (location: (1,8)-(1,16))
│ │ ├── name: :kw
│ │ ├── name_loc: (1,8)-(1,11) = "kw:"
│ │ └── value:

2
test/prism/snapshots/seattlerb/defn_kwarg_no_parens.txt
View File

@ -14,7 +14,7 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,6)-(1,10))
│ │ └── @ RequiredKeywordParameterNode (location: (1,6)-(1,10))
│ │ ├── name: :a
│ │ ├── name_loc: (1,6)-(1,8) = "a:"
│ │ └── value:

2
test/prism/snapshots/seattlerb/defn_kwarg_val.txt
View File

@ -16,7 +16,7 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,9)-(1,12))
│ │ └── @ RequiredKeywordParameterNode (location: (1,9)-(1,12))
│ │ ├── name: :b
│ │ ├── name_loc: (1,9)-(1,11) = "b:"
│ │ └── value:

2
test/prism/snapshots/seattlerb/defs_kwarg.txt
View File

@ -15,7 +15,7 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,11)-(1,15))
│ │ └── @ RequiredKeywordParameterNode (location: (1,11)-(1,15))
│ │ ├── name: :b
│ │ ├── name_loc: (1,11)-(1,13) = "b:"
│ │ └── value:

2
test/prism/snapshots/seattlerb/f_kw.txt
View File

@ -14,7 +14,7 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,6)-(1,10))
│ │ └── @ RequiredKeywordParameterNode (location: (1,6)-(1,10))
│ │ ├── name: :k
│ │ ├── name_loc: (1,6)-(1,8) = "k:"
│ │ └── value:

5
test/prism/snapshots/seattlerb/f_kw__required.txt
View File

@ -14,10 +14,9 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,6)-(1,8))
│ │ └── @ OptionalKeywordParameterNode (location: (1,6)-(1,8))
│ │ ├── name: :k
│ │ ├── name_loc: (1,6)-(1,8) = "k:"
│ │ └── value: ∅
│ │ └── name_loc: (1,6)-(1,8) = "k:"
│ ├── keyword_rest: ∅
│ └── block: ∅
├── body: ∅

2
test/prism/snapshots/seattlerb/iter_kwarg.txt
View File

@ -22,7 +22,7 @@
│ │ │ ├── rest: ∅
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 1)
│ │ │ │ └── @ KeywordParameterNode (location: (1,5)-(1,9))
│ │ │ │ └── @ RequiredKeywordParameterNode (location: (1,5)-(1,9))
│ │ │ │ ├── name: :b
│ │ │ │ ├── name_loc: (1,5)-(1,7) = "b:"
│ │ │ │ └── value:

2
test/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt
View File

@ -22,7 +22,7 @@
│ │ │ ├── rest: ∅
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 1)
│ │ │ │ └── @ KeywordParameterNode (location: (1,5)-(1,9))
│ │ │ │ └── @ RequiredKeywordParameterNode (location: (1,5)-(1,9))
│ │ │ │ ├── name: :b
│ │ │ │ ├── name_loc: (1,5)-(1,7) = "b:"
│ │ │ │ └── value:

10
test/prism/snapshots/seattlerb/required_kwarg_no_value.txt
View File

@ -14,14 +14,12 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 2)
│ │ ├── @ KeywordParameterNode (location: (1,6)-(1,8))
│ │ ├── @ OptionalKeywordParameterNode (location: (1,6)-(1,8))
│ │ │ ├── name: :a
│ │ │ ├── name_loc: (1,6)-(1,8) = "a:"
│ │ │ └── value: ∅
│ │ └── @ KeywordParameterNode (location: (1,10)-(1,12))
│ │ │ └── name_loc: (1,6)-(1,8) = "a:"
│ │ └── @ OptionalKeywordParameterNode (location: (1,10)-(1,12))
│ │ ├── name: :b
│ │ ├── name_loc: (1,10)-(1,12) = "b:"
│ │ └── value: ∅
│ │ └── name_loc: (1,10)-(1,12) = "b:"
│ ├── keyword_rest: ∅
│ └── block: ∅
├── body: ∅

2
test/prism/snapshots/seattlerb/stabby_block_kw.txt
View File

@ -17,7 +17,7 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (1,4)-(1,8))
│ │ │ └── @ RequiredKeywordParameterNode (location: (1,4)-(1,8))
│ │ │ ├── name: :k
│ │ │ ├── name_loc: (1,4)-(1,6) = "k:"
│ │ │ └── value:

5
test/prism/snapshots/seattlerb/stabby_block_kw__required.txt
View File

@ -17,10 +17,9 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (1,4)-(1,6))
│ │ │ └── @ OptionalKeywordParameterNode (location: (1,4)-(1,6))
│ │ │ ├── name: :k
│ │ │ ├── name_loc: (1,4)-(1,6) = "k:"
│ │ │ └── value: ∅
│ │ │ └── name_loc: (1,4)-(1,6) = "k:"
│ │ ├── keyword_rest: ∅
│ │ └── block: ∅
│ ├── locals: (length: 0)

23
test/prism/snapshots/unparser/corpus/literal/def.txt
View File

@ -194,14 +194,12 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 2)
│ │ │ ├── @ KeywordParameterNode (location: (21,8)-(21,12))
│ │ │ ├── @ OptionalKeywordParameterNode (location: (21,8)-(21,12))
│ │ │ │ ├── name: :bar
│ │ │ │ ├── name_loc: (21,8)-(21,12) = "bar:"
│ │ │ │ └── value: ∅
│ │ │ └── @ KeywordParameterNode (location: (21,14)-(21,18))
│ │ │ │ └── name_loc: (21,8)-(21,12) = "bar:"
│ │ │ └── @ OptionalKeywordParameterNode (location: (21,14)-(21,18))
│ │ │ ├── name: :baz
│ │ │ ├── name_loc: (21,14)-(21,18) = "baz:"
│ │ │ └── value: ∅
│ │ │ └── name_loc: (21,14)-(21,18) = "baz:"
│ │ ├── keyword_rest: ∅
│ │ └── block: ∅
│ ├── body: ∅
@ -629,7 +627,7 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (74,8)-(74,14))
│ │ │ └── @ RequiredKeywordParameterNode (location: (74,8)-(74,14))
│ │ │ ├── name: :bar
│ │ │ ├── name_loc: (74,8)-(74,12) = "bar:"
│ │ │ └── value:
@ -656,7 +654,7 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (77,8)-(77,16))
│ │ │ └── @ RequiredKeywordParameterNode (location: (77,8)-(77,16))
│ │ │ ├── name: :bar
│ │ │ ├── name_loc: (77,8)-(77,12) = "bar:"
│ │ │ └── value:
@ -691,7 +689,7 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (80,8)-(80,18))
│ │ │ └── @ RequiredKeywordParameterNode (location: (80,8)-(80,18))
│ │ │ ├── name: :bar
│ │ │ ├── name_loc: (80,8)-(80,12) = "bar:"
│ │ │ └── value:
@ -1092,11 +1090,10 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 2)
│ │ │ ├── @ KeywordParameterNode (location: (123,8)-(123,12))
│ │ │ ├── @ OptionalKeywordParameterNode (location: (123,8)-(123,12))
│ │ │ │ ├── name: :bar
│ │ │ │ ├── name_loc: (123,8)-(123,12) = "bar:"
│ │ │ │ └── value: ∅
│ │ │ └── @ KeywordParameterNode (location: (123,14)-(123,26))
│ │ │ │ └── name_loc: (123,8)-(123,12) = "bar:"
│ │ │ └── @ RequiredKeywordParameterNode (location: (123,14)-(123,26))
│ │ │ ├── name: :baz
│ │ │ ├── name_loc: (123,14)-(123,18) = "baz:"
│ │ │ └── value:

13
test/prism/snapshots/whitequark/args.txt
View File

@ -369,7 +369,7 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (23,7)-(23,13))
│ │ │ └── @ RequiredKeywordParameterNode (location: (23,7)-(23,13))
│ │ │ ├── name: :foo
│ │ │ ├── name_loc: (23,7)-(23,11) = "foo:"
│ │ │ └── value:
@ -400,13 +400,13 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 2)
│ │ │ ├── @ KeywordParameterNode (location: (25,7)-(25,13))
│ │ │ ├── @ RequiredKeywordParameterNode (location: (25,7)-(25,13))
│ │ │ │ ├── name: :foo
│ │ │ │ ├── name_loc: (25,7)-(25,11) = "foo:"
│ │ │ │ └── value:
│ │ │ │ @ IntegerNode (location: (25,12)-(25,13))
│ │ │ │ └── flags: decimal
│ │ │ └── @ KeywordParameterNode (location: (25,15)-(25,21))
│ │ │ └── @ RequiredKeywordParameterNode (location: (25,15)-(25,21))
│ │ │ ├── name: :bar
│ │ │ ├── name_loc: (25,15)-(25,19) = "bar:"
│ │ │ └── value:
@ -811,10 +811,9 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (51,6)-(51,10))
│ │ │ └── @ OptionalKeywordParameterNode (location: (51,6)-(51,10))
│ │ │ ├── name: :foo
│ │ │ ├── name_loc: (51,6)-(51,10) = "foo:"
│ │ │ └── value: ∅
│ │ │ └── name_loc: (51,6)-(51,10) = "foo:"
│ │ ├── keyword_rest: ∅
│ │ └── block: ∅
│ ├── body: ∅
@ -836,7 +835,7 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (54,6)-(54,13))
│ │ │ └── @ RequiredKeywordParameterNode (location: (54,6)-(54,13))
│ │ │ ├── name: :foo
│ │ │ ├── name_loc: (54,6)-(54,10) = "foo:"
│ │ │ └── value:

11
test/prism/snapshots/whitequark/blockargs.txt
View File

@ -963,7 +963,7 @@
│ │ │ │ ├── rest: ∅
│ │ │ │ ├── posts: (length: 0)
│ │ │ │ ├── keywords: (length: 1)
│ │ │ │ │ └── @ KeywordParameterNode (location: (57,4)-(57,10))
│ │ │ │ │ └── @ RequiredKeywordParameterNode (location: (57,4)-(57,10))
│ │ │ │ │ ├── name: :foo
│ │ │ │ │ ├── name_loc: (57,4)-(57,8) = "foo:"
│ │ │ │ │ └── value:
@ -1002,13 +1002,13 @@
│ │ │ │ ├── rest: ∅
│ │ │ │ ├── posts: (length: 0)
│ │ │ │ ├── keywords: (length: 2)
│ │ │ │ │ ├── @ KeywordParameterNode (location: (59,4)-(59,10))
│ │ │ │ │ ├── @ RequiredKeywordParameterNode (location: (59,4)-(59,10))
│ │ │ │ │ │ ├── name: :foo
│ │ │ │ │ │ ├── name_loc: (59,4)-(59,8) = "foo:"
│ │ │ │ │ │ └── value:
│ │ │ │ │ │ @ IntegerNode (location: (59,9)-(59,10))
│ │ │ │ │ │ └── flags: decimal
│ │ │ │ │ └── @ KeywordParameterNode (location: (59,12)-(59,18))
│ │ │ │ │ └── @ RequiredKeywordParameterNode (location: (59,12)-(59,18))
│ │ │ │ │ ├── name: :bar
│ │ │ │ │ ├── name_loc: (59,12)-(59,16) = "bar:"
│ │ │ │ │ └── value:
@ -1051,10 +1051,9 @@
│ │ │ │ ├── rest: ∅
│ │ │ │ ├── posts: (length: 0)
│ │ │ │ ├── keywords: (length: 1)
│ │ │ │ │ └── @ KeywordParameterNode (location: (61,4)-(61,8))
│ │ │ │ │ └── @ OptionalKeywordParameterNode (location: (61,4)-(61,8))
│ │ │ │ │ ├── name: :foo
│ │ │ │ │ ├── name_loc: (61,4)-(61,8) = "foo:"
│ │ │ │ │ └── value: ∅
│ │ │ │ │ └── name_loc: (61,4)-(61,8) = "foo:"
│ │ │ │ ├── keyword_rest: ∅
│ │ │ │ └── block: ∅
│ │ │ ├── locals: (length: 0)

5
test/prism/snapshots/whitequark/kwarg.txt
View File

@ -14,10 +14,9 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,6)-(1,10))
│ │ └── @ OptionalKeywordParameterNode (location: (1,6)-(1,10))
│ │ ├── name: :foo
│ │ ├── name_loc: (1,6)-(1,10) = "foo:"
│ │ └── value: ∅
│ │ └── name_loc: (1,6)-(1,10) = "foo:"
│ ├── keyword_rest: ∅
│ └── block: ∅
├── body: ∅

2
test/prism/snapshots/whitequark/kwoptarg.txt
View File

@ -14,7 +14,7 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,6)-(1,12))
│ │ └── @ RequiredKeywordParameterNode (location: (1,6)-(1,12))
│ │ ├── name: :foo
│ │ ├── name_loc: (1,6)-(1,10) = "foo:"
│ │ └── value:

2
test/prism/snapshots/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt
View File

@ -14,7 +14,7 @@
│ ├── rest: ∅
│ ├── posts: (length: 0)
│ ├── keywords: (length: 1)
│ │ └── @ KeywordParameterNode (location: (1,6)-(1,12))
│ │ └── @ RequiredKeywordParameterNode (location: (1,6)-(1,12))
│ │ ├── name: :a
│ │ ├── name_loc: (1,6)-(1,8) = "a:"
│ │ └── value:

2
test/prism/snapshots/whitequark/ruby_bug_15789.txt
View File

@ -80,7 +80,7 @@
│ │ │ │ ├── rest: ∅
│ │ │ │ ├── posts: (length: 0)
│ │ │ │ ├── keywords: (length: 1)
│ │ │ │ │ └── @ KeywordParameterNode (location: (3,5)-(3,14))
│ │ │ │ │ └── @ RequiredKeywordParameterNode (location: (3,5)-(3,14))
│ │ │ │ │ ├── name: :a
│ │ │ │ │ ├── name_loc: (3,5)-(3,7) = "a:"
│ │ │ │ │ └── value:

5
test/prism/snapshots/whitequark/ruby_bug_9669.txt
View File

@ -14,10 +14,9 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (1,6)-(1,8))
│ │ │ └── @ OptionalKeywordParameterNode (location: (1,6)-(1,8))
│ │ │ ├── name: :b
│ │ │ ├── name_loc: (1,6)-(1,8) = "b:"
│ │ │ └── value: ∅
│ │ │ └── name_loc: (1,6)-(1,8) = "b:"
│ │ ├── keyword_rest: ∅
│ │ └── block: ∅
│ ├── body:

7
test/prism/snapshots/whitequark/send_lambda_args_noparen.txt
View File

@ -17,7 +17,7 @@
│ │ │ ├── rest: ∅
│ │ │ ├── posts: (length: 0)
│ │ │ ├── keywords: (length: 1)
│ │ │ │ └── @ KeywordParameterNode (location: (1,3)-(1,7))
│ │ │ │ └── @ RequiredKeywordParameterNode (location: (1,3)-(1,7))
│ │ │ │ ├── name: :a
│ │ │ │ ├── name_loc: (1,3)-(1,5) = "a:"
│ │ │ │ └── value:
@ -43,10 +43,9 @@
│ │ ├── rest: ∅
│ │ ├── posts: (length: 0)
│ │ ├── keywords: (length: 1)
│ │ │ └── @ KeywordParameterNode (location: (3,3)-(3,5))
│ │ │ └── @ OptionalKeywordParameterNode (location: (3,3)-(3,5))
│ │ │ ├── name: :a
│ │ │ ├── name_loc: (3,3)-(3,5) = "a:"
│ │ │ └── value: ∅
│ │ │ └── name_loc: (3,3)-(3,5) = "a:"
│ │ ├── keyword_rest: ∅
│ │ └── block: ∅
│ ├── locals: (length: 0)