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

[ruby/yarp] Rename statements to body where appropriate

Browse Source 
https://github.com/ruby/yarp/commit/0aa7d9d10c
This commit is contained in:
Kevin Newton 2023-08-18 20:47:58 -04:00 committed by git
parent 3dff315ed3
commit 1d0b627b70
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/yarp/location_test.rb
View File

@ -69,8 +69,8 @@ module YARP
assert_location(BeginNode, "begin foo; rescue bar\nelse baz end") assert_location(BeginNode, "begin foo; rescue bar\nelse baz end")
assert_location(BeginNode, "begin foo; rescue bar\nelse baz\nensure qux end") assert_location(BeginNode, "begin foo; rescue bar\nelse baz\nensure qux end")
assert_location(BeginNode, "class Foo\nrescue then end", 10..25, &:statements) assert_location(BeginNode, "class Foo\nrescue then end", 10..25, &:body)
assert_location(BeginNode, "module Foo\nrescue then end", 11..26, &:statements) assert_location(BeginNode, "module Foo\nrescue then end", 11..26, &:body)
end end
def test_BlockArgumentNode def test_BlockArgumentNode
@ -287,7 +287,7 @@ module YARP
def test_ForwardingArgumentsNode def test_ForwardingArgumentsNode
assert_location(ForwardingArgumentsNode, "def foo(...); bar(...); end", 18...21) do |node| assert_location(ForwardingArgumentsNode, "def foo(...); bar(...); end", 18...21) do |node|
node.statements.body.first.arguments.arguments.first node.body.body.first.arguments.arguments.first
end end
end end
@ -599,13 +599,13 @@ module YARP
end end
def test_StatementsNode def test_StatementsNode
assert_location(StatementsNode, "foo { 1 }", 6...7) { |node| node.block.statements } assert_location(StatementsNode, "foo { 1 }", 6...7) { |node| node.block.body }
assert_location(StatementsNode, "(1)", 1...2, &:statements) assert_location(StatementsNode, "(1)", 1...2, &:body)
assert_location(StatementsNode, "def foo; 1; end", 9...10, &:statements) assert_location(StatementsNode, "def foo; 1; end", 9...10, &:body)
assert_location(StatementsNode, "def foo = 1", 10...11, &:statements) assert_location(StatementsNode, "def foo = 1", 10...11, &:body)
assert_location(StatementsNode, "def foo; 1\n2; end", 9...12, &:statements) assert_location(StatementsNode, "def foo; 1\n2; end", 9...12, &:body)
assert_location(StatementsNode, "if foo; bar; end", 8...11, &:statements) assert_location(StatementsNode, "if foo; bar; end", 8...11, &:statements)
assert_location(StatementsNode, "foo if bar", 0...3, &:statements) assert_location(StatementsNode, "foo if bar", 0...3, &:statements)
@ -631,11 +631,11 @@ module YARP
assert_location(StatementsNode, "begin; ensure; foo; end", 15...18) { |node| node.ensure_clause.statements } assert_location(StatementsNode, "begin; ensure; foo; end", 15...18) { |node| node.ensure_clause.statements }
assert_location(StatementsNode, "begin; rescue; else; foo; end", 21...24) { |node| node.else_clause.statements } assert_location(StatementsNode, "begin; rescue; else; foo; end", 21...24) { |node| node.else_clause.statements }
assert_location(StatementsNode, "class Foo; foo; end", 11...14, &:statements) assert_location(StatementsNode, "class Foo; foo; end", 11...14, &:body)
assert_location(StatementsNode, "module Foo; foo; end", 12...15, &:statements) assert_location(StatementsNode, "module Foo; foo; end", 12...15, &:body)
assert_location(StatementsNode, "class << self; foo; end", 15...18, &:statements) assert_location(StatementsNode, "class << self; foo; end", 15...18, &:body)
assert_location(StatementsNode, "-> { foo }", 5...8, &:statements) assert_location(StatementsNode, "-> { foo }", 5...8, &:body)
assert_location(StatementsNode, "BEGIN { foo }", 8...11, &:statements) assert_location(StatementsNode, "BEGIN { foo }", 8...11, &:statements)
assert_location(StatementsNode, "END { foo }", 6...9, &:statements) assert_location(StatementsNode, "END { foo }", 6...9, &:statements)

14
yarp/config.yml
View File

@ -540,7 +540,7 @@ nodes:
- name: parameters - name: parameters
type: node? type: node?
kind: BlockParametersNode kind: BlockParametersNode
- name: statements - name: body
type: node? type: node?
- name: opening_loc - name: opening_loc
type: location type: location
@ -727,7 +727,7 @@ nodes:
type: location? type: location?
- name: superclass - name: superclass
type: node? type: node?
- name: statements - name: body
type: node? type: node?
- name: end_keyword_loc - name: end_keyword_loc
type: location type: location
@ -816,7 +816,7 @@ nodes:
- name: parameters - name: parameters
type: node? type: node?
kind: ParametersNode kind: ParametersNode
- name: statements - name: body
type: node? type: node?
- name: locals - name: locals
type: constant[] type: constant[]
@ -1239,7 +1239,7 @@ nodes:
- name: parameters - name: parameters
type: node? type: node?
kind: BlockParametersNode kind: BlockParametersNode
- name: statements - name: body
type: node? type: node?
comment: | comment: |
Represents using a lambda literal (not the lambda method call). Represents using a lambda literal (not the lambda method call).
@ -1314,7 +1314,7 @@ nodes:
type: location type: location
- name: constant_path - name: constant_path
type: node type: node
- name: statements - name: body
type: node? type: node?
- name: end_keyword_loc - name: end_keyword_loc
type: location type: location
@ -1459,7 +1459,7 @@ nodes:
end end
- name: ParenthesesNode - name: ParenthesesNode
child_nodes: child_nodes:
- name: statements - name: body
type: node? type: node?
- name: opening_loc - name: opening_loc
type: location type: location
@ -1702,7 +1702,7 @@ nodes:
type: location type: location
- name: expression - name: expression
type: node type: node
- name: statements - name: body
type: node? type: node?
- name: end_keyword_loc - name: end_keyword_loc
type: location type: location

34
yarp/yarp.c
View File

@ -450,8 +450,8 @@ yp_flip_flop(yp_node_t *node) {
case YP_NODE_PARENTHESES_NODE: { case YP_NODE_PARENTHESES_NODE: {
yp_parentheses_node_t *cast = (yp_parentheses_node_t *) node; yp_parentheses_node_t *cast = (yp_parentheses_node_t *) node;
if ((cast->statements != NULL) && YP_NODE_TYPE_P(cast->statements, YP_NODE_STATEMENTS_NODE)) { if ((cast->body != NULL) && YP_NODE_TYPE_P(cast->body, YP_NODE_STATEMENTS_NODE)) {
yp_statements_node_t *statements = (yp_statements_node_t *) cast->statements; yp_statements_node_t *statements = (yp_statements_node_t *) cast->body;
if (statements->body.size == 1) yp_flip_flop(statements->body.nodes[0]); if (statements->body.size == 1) yp_flip_flop(statements->body.nodes[0]);
} }
@ -1018,7 +1018,7 @@ yp_block_argument_node_create(yp_parser_t *parser, const yp_token_t *operator, y
// Allocate and initialize a new BlockNode node. // Allocate and initialize a new BlockNode node.
static yp_block_node_t * static yp_block_node_t *
yp_block_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *opening, yp_block_parameters_node_t *parameters, yp_node_t *statements, const yp_token_t *closing) { yp_block_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *opening, yp_block_parameters_node_t *parameters, yp_node_t *body, const yp_token_t *closing) {
yp_block_node_t *node = YP_ALLOC_NODE(parser, yp_block_node_t); yp_block_node_t *node = YP_ALLOC_NODE(parser, yp_block_node_t);
*node = (yp_block_node_t) { *node = (yp_block_node_t) {
@ -1028,7 +1028,7 @@ yp_block_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const y
}, },
.locals = *locals, .locals = *locals,
.parameters = parameters, .parameters = parameters,
.statements = statements, .body = body,
.opening_loc = YP_LOCATION_TOKEN_VALUE(opening), .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
.closing_loc = YP_LOCATION_TOKEN_VALUE(closing) .closing_loc = YP_LOCATION_TOKEN_VALUE(closing)
}; };
@ -1486,7 +1486,7 @@ yp_case_node_end_keyword_loc_set(yp_case_node_t *node, const yp_token_t *end_key
// Allocate a new ClassNode node. // Allocate a new ClassNode node.
static yp_class_node_t * static yp_class_node_t *
yp_class_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *class_keyword, yp_node_t *constant_path, const yp_token_t *inheritance_operator, yp_node_t *superclass, yp_node_t *statements, const yp_token_t *end_keyword) { yp_class_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *class_keyword, yp_node_t *constant_path, const yp_token_t *inheritance_operator, yp_node_t *superclass, yp_node_t *body, const yp_token_t *end_keyword) {
yp_class_node_t *node = YP_ALLOC_NODE(parser, yp_class_node_t); yp_class_node_t *node = YP_ALLOC_NODE(parser, yp_class_node_t);
*node = (yp_class_node_t) { *node = (yp_class_node_t) {
@ -1499,7 +1499,7 @@ yp_class_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const y
.constant_path = constant_path, .constant_path = constant_path,
.inheritance_operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(inheritance_operator), .inheritance_operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(inheritance_operator),
.superclass = superclass, .superclass = superclass,
.statements = statements, .body = body,
.end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword) .end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword)
}; };
@ -1616,7 +1616,7 @@ yp_def_node_create(
const yp_token_t *name, const yp_token_t *name,
yp_node_t *receiver, yp_node_t *receiver,
yp_parameters_node_t *parameters, yp_parameters_node_t *parameters,
yp_node_t *statements, yp_node_t *body,
yp_constant_id_list_t *locals, yp_constant_id_list_t *locals,
const yp_token_t *def_keyword, const yp_token_t *def_keyword,
const yp_token_t *operator, const yp_token_t *operator,
@ -1629,7 +1629,7 @@ yp_def_node_create(
const char *end; const char *end;
if (end_keyword->type == YP_TOKEN_NOT_PROVIDED) { if (end_keyword->type == YP_TOKEN_NOT_PROVIDED) {
end = statements->location.end; end = body->location.end;
} else { } else {
end = end_keyword->end; end = end_keyword->end;
} }
@ -1642,7 +1642,7 @@ yp_def_node_create(
.name_loc = YP_LOCATION_TOKEN_VALUE(name), .name_loc = YP_LOCATION_TOKEN_VALUE(name),
.receiver = receiver, .receiver = receiver,
.parameters = parameters, .parameters = parameters,
.statements = statements, .body = body,
.locals = *locals, .locals = *locals,
.def_keyword_loc = YP_LOCATION_TOKEN_VALUE(def_keyword), .def_keyword_loc = YP_LOCATION_TOKEN_VALUE(def_keyword),
.operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator), .operator_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(operator),
@ -2553,7 +2553,7 @@ yp_lambda_node_create(
yp_constant_id_list_t *locals, yp_constant_id_list_t *locals,
const yp_token_t *opening, const yp_token_t *opening,
yp_block_parameters_node_t *parameters, yp_block_parameters_node_t *parameters,
yp_node_t *statements, yp_node_t *body,
const yp_token_t *closing const yp_token_t *closing
) { ) {
yp_lambda_node_t *node = YP_ALLOC_NODE(parser, yp_lambda_node_t); yp_lambda_node_t *node = YP_ALLOC_NODE(parser, yp_lambda_node_t);
@ -2569,7 +2569,7 @@ yp_lambda_node_create(
.locals = *locals, .locals = *locals,
.opening_loc = YP_LOCATION_TOKEN_VALUE(opening), .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
.parameters = parameters, .parameters = parameters,
.statements = statements .body = body
}; };
return node; return node;
@ -2679,7 +2679,7 @@ yp_match_required_node_create(yp_parser_t *parser, yp_node_t *value, yp_node_t *
// Allocate a new ModuleNode node. // Allocate a new ModuleNode node.
static yp_module_node_t * static yp_module_node_t *
yp_module_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *module_keyword, yp_node_t *constant_path, yp_node_t *statements, const yp_token_t *end_keyword) { yp_module_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *module_keyword, yp_node_t *constant_path, yp_node_t *body, const yp_token_t *end_keyword) {
yp_module_node_t *node = YP_ALLOC_NODE(parser, yp_module_node_t); yp_module_node_t *node = YP_ALLOC_NODE(parser, yp_module_node_t);
*node = (yp_module_node_t) { *node = (yp_module_node_t) {
@ -2693,7 +2693,7 @@ yp_module_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const
.locals = (locals == NULL ? ((yp_constant_id_list_t) { .ids = NULL, .size = 0, .capacity = 0 }) : *locals), .locals = (locals == NULL ? ((yp_constant_id_list_t) { .ids = NULL, .size = 0, .capacity = 0 }) : *locals),
.module_keyword_loc = YP_LOCATION_TOKEN_VALUE(module_keyword), .module_keyword_loc = YP_LOCATION_TOKEN_VALUE(module_keyword),
.constant_path = constant_path, .constant_path = constant_path,
.statements = statements, .body = body,
.end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword) .end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword)
}; };
@ -3006,7 +3006,7 @@ yp_program_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, yp_st
// Allocate and initialize new ParenthesesNode node. // Allocate and initialize new ParenthesesNode node.
static yp_parentheses_node_t * static yp_parentheses_node_t *
yp_parentheses_node_create(yp_parser_t *parser, const yp_token_t *opening, yp_node_t *statements, const yp_token_t *closing) { yp_parentheses_node_create(yp_parser_t *parser, const yp_token_t *opening, yp_node_t *body, const yp_token_t *closing) {
yp_parentheses_node_t *node = YP_ALLOC_NODE(parser, yp_parentheses_node_t); yp_parentheses_node_t *node = YP_ALLOC_NODE(parser, yp_parentheses_node_t);
*node = (yp_parentheses_node_t) { *node = (yp_parentheses_node_t) {
@ -3017,7 +3017,7 @@ yp_parentheses_node_create(yp_parser_t *parser, const yp_token_t *opening, yp_no
.end = closing->end .end = closing->end
} }
}, },
.statements = statements, .body = body,
.opening_loc = YP_LOCATION_TOKEN_VALUE(opening), .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
.closing_loc = YP_LOCATION_TOKEN_VALUE(closing) .closing_loc = YP_LOCATION_TOKEN_VALUE(closing)
}; };
@ -3363,7 +3363,7 @@ yp_self_node_create(yp_parser_t *parser, const yp_token_t *token) {
// Allocate a new SingletonClassNode node. // Allocate a new SingletonClassNode node.
static yp_singleton_class_node_t * static yp_singleton_class_node_t *
yp_singleton_class_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *class_keyword, const yp_token_t *operator, yp_node_t *expression, yp_node_t *statements, const yp_token_t *end_keyword) { yp_singleton_class_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *class_keyword, const yp_token_t *operator, yp_node_t *expression, yp_node_t *body, const yp_token_t *end_keyword) {
yp_singleton_class_node_t *node = YP_ALLOC_NODE(parser, yp_singleton_class_node_t); yp_singleton_class_node_t *node = YP_ALLOC_NODE(parser, yp_singleton_class_node_t);
*node = (yp_singleton_class_node_t) { *node = (yp_singleton_class_node_t) {
@ -3378,7 +3378,7 @@ yp_singleton_class_node_create(yp_parser_t *parser, yp_constant_id_list_t *local
.class_keyword_loc = YP_LOCATION_TOKEN_VALUE(class_keyword), .class_keyword_loc = YP_LOCATION_TOKEN_VALUE(class_keyword),
.operator_loc = YP_LOCATION_TOKEN_VALUE(operator), .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
.expression = expression, .expression = expression,
.statements = statements, .body = body,
.end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword) .end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword)
}; };