Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename constant pool fields to name or operator #1338

Merged
merged 2 commits into from
Aug 27, 2023
Merged

Rename constant pool fields to name or operator #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5fba6d
Fix paths in library_symbols_test.rb
eregon Aug 27, 2023
09d0a14
Rename constant pool fields to name or operator
eregon Aug 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ nodes:
type: location
- name: value
type: node
- name: operator_id
- name: operator
type: constant
comment: |
Represents the use of an assignment operator on a call.
Expand Down Expand Up @@ -1492,7 +1492,7 @@ nodes:
type: location
- name: value
type: node
- name: constant_id
- name: name
type: constant
- name: depth
type: uint32
Expand All @@ -1509,9 +1509,9 @@ nodes:
type: location
- name: value
type: node
- name: constant_id
- name: name
type: constant
- name: operator_id
- name: operator
type: constant
- name: depth
type: uint32
Expand All @@ -1528,7 +1528,7 @@ nodes:
type: location
- name: value
type: node
- name: constant_id
- name: name
type: constant
- name: depth
type: uint32
Expand All @@ -1539,7 +1539,7 @@ nodes:
^^^^^^^^^^^^^^^^
- name: LocalVariableReadNode
child_nodes:
- name: constant_id
- name: name
type: constant
- name: depth
type: uint32
Expand All @@ -1552,7 +1552,7 @@ nodes:
^^^
- name: LocalVariableTargetNode
child_nodes:
- name: constant_id
- name: name
type: constant
- name: depth
type: uint32
Expand All @@ -1563,7 +1563,7 @@ nodes:
^^^ ^^^
- name: LocalVariableWriteNode
child_nodes:
- name: constant_id
- name: name
type: constant
- name: depth
type: uint32
Expand Down Expand Up @@ -1682,7 +1682,7 @@ nodes:
^^
- name: OptionalParameterNode
child_nodes:
- name: constant_id
- name: name
type: constant
- name: name_loc
type: location
Expand Down Expand Up @@ -1883,7 +1883,7 @@ nodes:
end
- name: RequiredParameterNode
child_nodes:
- name: constant_id
- name: name
type: constant
comment: |
Represents a required parameter to a method, block, or lambda definition.
Expand Down
10 changes: 5 additions & 5 deletions lib/yarp.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,10 @@ def self.yarp_locals(source)
# order here so that we can compare properly.
if params
sorted = [
*params.requireds.grep(RequiredParameterNode).map(&:constant_id),
*params.optionals.map(&:constant_id),
*params.requireds.grep(RequiredParameterNode).map(&:name),
*params.optionals.map(&:name),
*((params.rest.name ? params.rest.name.to_sym : :*) if params.rest && params.rest.operator != ","),
*params.posts.grep(RequiredParameterNode).map(&:constant_id),
*params.posts.grep(RequiredParameterNode).map(&:name),
*params.keywords.reject(&:value).map { |param| param.name.chomp(":").to_sym },
*params.keywords.select(&:value).map { |param| param.name.chomp(":").to_sym }
Comment on lines 469 to 470
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd be consistent if KeywordParameterNode#name returns the Symbol without this extra handling, but for that it should probably be added to the constant pool first (and the constant pool needs to support owned strings first, #1134).

]
Expand All @@ -485,9 +485,9 @@ def self.yarp_locals(source)
when RequiredDestructuredParameterNode
param_stack.concat(param.parameters.reverse)
when RequiredParameterNode
sorted << param.constant_id
sorted << param.name
when SplatNode
sorted << param.expression.constant_id if param.expression
sorted << param.expression.name if param.expression
end
end

Expand Down
10 changes: 5 additions & 5 deletions lib/yarp/desugar_visitor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ def visit_instance_variable_operator_write_node(node)
# foo && foo = bar
def visit_local_variable_and_write_node(node)
AndNode.new(
LocalVariableReadNode.new(node.constant_id, node.depth, node.name_loc),
LocalVariableWriteNode.new(node.constant_id, node.depth, node.name_loc, node.value, node.operator_loc, node.location),
LocalVariableReadNode.new(node.name, node.depth, node.name_loc),
LocalVariableWriteNode.new(node.name, node.depth, node.name_loc, node.value, node.operator_loc, node.location),
node.operator_loc,
node.location
)
Expand All @@ -224,8 +224,8 @@ def visit_local_variable_and_write_node(node)
# foo || foo = bar
def visit_local_variable_or_write_node(node)
OrNode.new(
LocalVariableReadNode.new(node.constant_id, node.depth, node.name_loc),
LocalVariableWriteNode.new(node.constant_id, node.depth, node.name_loc, node.value, node.operator_loc, node.location),
LocalVariableReadNode.new(node.name, node.depth, node.name_loc),
LocalVariableWriteNode.new(node.name, node.depth, node.name_loc, node.value, node.operator_loc, node.location),
node.operator_loc,
node.location
)
Expand All @@ -237,7 +237,7 @@ def visit_local_variable_or_write_node(node)
#
# foo = foo + bar
def visit_local_variable_operator_write_node(node)
desugar_operator_write_node(node, LocalVariableWriteNode, LocalVariableReadNode, arguments: [node.constant_id, node.depth])
desugar_operator_write_node(node, LocalVariableWriteNode, LocalVariableReadNode, arguments: [node.name, node.depth])
end

private
Expand Down
36 changes: 18 additions & 18 deletions src/yarp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@ yp_call_operator_write_node_create(yp_parser_t *parser, yp_call_node_t *target,
.target = target,
.operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
.value = value,
.operator_id = yp_parser_constant_id_location(parser, operator->start, operator->end - 1)
.operator = yp_parser_constant_id_location(parser, operator->start, operator->end - 1)
};

return node;
Expand Down Expand Up @@ -2959,7 +2959,7 @@ yp_lambda_node_create(

// Allocate and initialize a new LocalVariableAndWriteNode node.
static yp_local_variable_and_write_node_t *
yp_local_variable_and_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value, yp_constant_id_t constant_id, uint32_t depth) {
yp_local_variable_and_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value, yp_constant_id_t name, uint32_t depth) {
assert(YP_NODE_TYPE_P(target, YP_NODE_LOCAL_VARIABLE_READ_NODE) || YP_NODE_TYPE_P(target, YP_NODE_CALL_NODE));
assert(operator->type == YP_TOKEN_AMPERSAND_AMPERSAND_EQUAL);
yp_local_variable_and_write_node_t *node = YP_ALLOC_NODE(parser, yp_local_variable_and_write_node_t);
Expand All @@ -2975,7 +2975,7 @@ yp_local_variable_and_write_node_create(yp_parser_t *parser, yp_node_t *target,
.name_loc = target->location,
.operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
.value = value,
.constant_id = constant_id,
.name = name,
.depth = depth
};

Expand All @@ -2984,7 +2984,7 @@ yp_local_variable_and_write_node_create(yp_parser_t *parser, yp_node_t *target,

// Allocate and initialize a new LocalVariableOperatorWriteNode node.
static yp_local_variable_operator_write_node_t *
yp_local_variable_operator_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value, yp_constant_id_t constant_id, uint32_t depth) {
yp_local_variable_operator_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value, yp_constant_id_t name, uint32_t depth) {
yp_local_variable_operator_write_node_t *node = YP_ALLOC_NODE(parser, yp_local_variable_operator_write_node_t);

*node = (yp_local_variable_operator_write_node_t) {
Expand All @@ -2998,8 +2998,8 @@ yp_local_variable_operator_write_node_create(yp_parser_t *parser, yp_node_t *tar
.name_loc = target->location,
.operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
.value = value,
.constant_id = constant_id,
.operator_id = yp_parser_constant_id_location(parser, operator->start, operator->end - 1),
.name = name,
.operator = yp_parser_constant_id_location(parser, operator->start, operator->end - 1),
.depth = depth
};

Expand All @@ -3008,7 +3008,7 @@ yp_local_variable_operator_write_node_create(yp_parser_t *parser, yp_node_t *tar

// Allocate and initialize a new LocalVariableOrWriteNode node.
static yp_local_variable_or_write_node_t *
yp_local_variable_or_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value, yp_constant_id_t constant_id, uint32_t depth) {
yp_local_variable_or_write_node_create(yp_parser_t *parser, yp_node_t *target, const yp_token_t *operator, yp_node_t *value, yp_constant_id_t name, uint32_t depth) {
assert(YP_NODE_TYPE_P(target, YP_NODE_LOCAL_VARIABLE_READ_NODE) || YP_NODE_TYPE_P(target, YP_NODE_CALL_NODE));
assert(operator->type == YP_TOKEN_PIPE_PIPE_EQUAL);
yp_local_variable_or_write_node_t *node = YP_ALLOC_NODE(parser, yp_local_variable_or_write_node_t);
Expand All @@ -3024,7 +3024,7 @@ yp_local_variable_or_write_node_create(yp_parser_t *parser, yp_node_t *target, c
.name_loc = target->location,
.operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
.value = value,
.constant_id = constant_id,
.name = name,
.depth = depth
};

Expand All @@ -3041,7 +3041,7 @@ yp_local_variable_read_node_create(yp_parser_t *parser, const yp_token_t *name,
.type = YP_NODE_LOCAL_VARIABLE_READ_NODE,
.location = YP_LOCATION_TOKEN_VALUE(name)
},
.constant_id = yp_parser_constant_id_token(parser, name),
.name = yp_parser_constant_id_token(parser, name),
.depth = depth
};

Expand All @@ -3050,7 +3050,7 @@ yp_local_variable_read_node_create(yp_parser_t *parser, const yp_token_t *name,

// Allocate and initialize a new LocalVariableWriteNode node.
static yp_local_variable_write_node_t *
yp_local_variable_write_node_create(yp_parser_t *parser, yp_constant_id_t constant_id, uint32_t depth, yp_node_t *value, const yp_location_t *name_loc, const yp_token_t *operator) {
yp_local_variable_write_node_create(yp_parser_t *parser, yp_constant_id_t name, uint32_t depth, yp_node_t *value, const yp_location_t *name_loc, const yp_token_t *operator) {
yp_local_variable_write_node_t *node = YP_ALLOC_NODE(parser, yp_local_variable_write_node_t);

*node = (yp_local_variable_write_node_t) {
Expand All @@ -3061,7 +3061,7 @@ yp_local_variable_write_node_create(yp_parser_t *parser, yp_constant_id_t consta
.end = value->location.end
}
},
.constant_id = constant_id,
.name = name,
.depth = depth,
.value = value,
.name_loc = *name_loc,
Expand All @@ -3081,7 +3081,7 @@ yp_local_variable_target_node_create(yp_parser_t *parser, const yp_token_t *name
.type = YP_NODE_LOCAL_VARIABLE_TARGET_NODE,
.location = YP_LOCATION_TOKEN_VALUE(name)
},
.constant_id = yp_parser_constant_id_token(parser, name),
.name = yp_parser_constant_id_token(parser, name),
.depth = 0
};

Expand Down Expand Up @@ -3279,7 +3279,7 @@ yp_optional_parameter_node_create(yp_parser_t *parser, const yp_token_t *name, c
.end = value->location.end
}
},
.constant_id = yp_parser_constant_id_token(parser, name),
.name = yp_parser_constant_id_token(parser, name),
.name_loc = YP_LOCATION_TOKEN_VALUE(name),
.operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
.value = value
Expand Down Expand Up @@ -3630,7 +3630,7 @@ yp_required_parameter_node_create(yp_parser_t *parser, const yp_token_t *token)
.type = YP_NODE_REQUIRED_PARAMETER_NODE,
.location = YP_LOCATION_TOKEN_VALUE(token)
},
.constant_id = yp_parser_constant_id_token(parser, token)
.name = yp_parser_constant_id_token(parser, token)
};

return node;
Expand Down Expand Up @@ -7987,7 +7987,7 @@ parse_write(yp_parser_t *parser, yp_node_t *target, yp_token_t *operator, yp_nod
case YP_NODE_LOCAL_VARIABLE_READ_NODE: {
yp_local_variable_read_node_t *local_read = (yp_local_variable_read_node_t *) target;

yp_constant_id_t constant_id = local_read->constant_id;
yp_constant_id_t constant_id = local_read->name;
uint32_t depth = local_read->depth;

yp_location_t name_loc = target->location;
Expand Down Expand Up @@ -12793,7 +12793,7 @@ parse_expression_infix(yp_parser_t *parser, yp_node_t *node, yp_binding_power_t
parser_lex(parser);

yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after &&=");
yp_node_t *result = (yp_node_t *) yp_local_variable_and_write_node_create(parser, node, &token, value, cast->constant_id, cast->depth);
yp_node_t *result = (yp_node_t *) yp_local_variable_and_write_node_create(parser, node, &token, value, cast->name, cast->depth);

yp_node_destroy(parser, node);
return result;
Expand Down Expand Up @@ -12894,7 +12894,7 @@ parse_expression_infix(yp_parser_t *parser, yp_node_t *node, yp_binding_power_t
parser_lex(parser);

yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after ||=");
yp_node_t *result = (yp_node_t *) yp_local_variable_or_write_node_create(parser, node, &token, value, cast->constant_id, cast->depth);
yp_node_t *result = (yp_node_t *) yp_local_variable_or_write_node_create(parser, node, &token, value, cast->name, cast->depth);

yp_node_destroy(parser, node);
return result;
Expand Down Expand Up @@ -13005,7 +13005,7 @@ parse_expression_infix(yp_parser_t *parser, yp_node_t *node, yp_binding_power_t
parser_lex(parser);

yp_node_t *value = parse_expression(parser, binding_power, "Expected a value after the operator.");
yp_node_t *result = (yp_node_t *) yp_local_variable_operator_write_node_create(parser, node, &token, value, cast->constant_id, cast->depth);
yp_node_t *result = (yp_node_t *) yp_local_variable_operator_write_node_create(parser, node, &token, value, cast->name, cast->depth);

yp_node_destroy(parser, node);
return result;
Expand Down
6 changes: 3 additions & 3 deletions test/yarp/library_symbols_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ class LibrarySymbolsTest < Test::Unit::TestCase
def setup
super

@librubyparser_a = File.expand_path(File.join(__dir__, "..", "build", "librubyparser.a"))
@librubyparser_so = File.expand_path(File.join(__dir__, "..", "build", "librubyparser.so"))
@yarp_so = File.expand_path(File.join(__dir__, "..", "lib", "yarp", "yarp.so"))
@librubyparser_a = File.expand_path("../../build/librubyparser.a", __dir__)
@librubyparser_so = File.expand_path("../../build/librubyparser.so", __dir__)
@yarp_so = File.expand_path("../../lib/yarp/yarp.so", __dir__)
end

# objdump runner and helpers
Expand Down