Skip to content

Commit 53763d6

Browse files
kddnewtonkddnewton
committed
Style/renaming
1 parent ffeb331 commit 53763d6

File tree

1 file changed

+37
-45
lines changed

1 file changed

+37
-45
lines changed

‎src/prism.c

Lines changed: 37 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3572,50 +3572,41 @@ pm_hash_node_closing_loc_set(pm_hash_node_t *hash, pm_token_t *token) {
35723572
hash->closing_loc = PM_LOCATION_TOKEN_VALUE(token);
35733573
}
35743574

3575-
static pm_node_t *
3576-
pm_assignment_value_node(pm_node_t *node) {
3575+
/**
3576+
* Retrieve the value being written to the given node.
3577+
*/
3578+
static const pm_node_t *
3579+
pm_write_node_value(const pm_node_t *node) {
35773580
switch (PM_NODE_TYPE(node)) {
3578-
case PM_CLASS_VARIABLE_WRITE_NODE: {
3579-
const pm_class_variable_write_node_t *cast = (pm_class_variable_write_node_t *)node;
3580-
return cast->value;
3581-
}
3582-
case PM_CONSTANT_WRITE_NODE: {
3583-
const pm_constant_write_node_t *cast = (pm_constant_write_node_t *)node;
3584-
return cast->value;
3585-
}
3586-
case PM_GLOBAL_VARIABLE_WRITE_NODE: {
3587-
const pm_global_variable_write_node_t *cast = (pm_global_variable_write_node_t *)node;
3588-
return cast->value;
3589-
}
3590-
case PM_INSTANCE_VARIABLE_WRITE_NODE: {
3591-
const pm_instance_variable_write_node_t *cast = (pm_instance_variable_write_node_t *)node;
3592-
return cast->value;
3593-
}
3594-
case PM_LOCAL_VARIABLE_WRITE_NODE: {
3595-
const pm_local_variable_write_node_t *cast = (pm_local_variable_write_node_t *)node;
3596-
return cast->value;
3597-
}
3598-
case PM_MULTI_WRITE_NODE: {
3599-
const pm_multi_write_node_t *cast = (pm_multi_write_node_t *)node;
3600-
return cast->value;
3601-
}
3581+
case PM_CLASS_VARIABLE_WRITE_NODE:
3582+
return ((const pm_class_variable_write_node_t *) node)->value;
3583+
case PM_CONSTANT_WRITE_NODE:
3584+
return ((const pm_constant_write_node_t * ) node)->value;
3585+
case PM_GLOBAL_VARIABLE_WRITE_NODE:
3586+
return ((const pm_global_variable_write_node_t *) node)->value;
3587+
case PM_INSTANCE_VARIABLE_WRITE_NODE:
3588+
return ((const pm_instance_variable_write_node_t *) node)->value;
3589+
case PM_LOCAL_VARIABLE_WRITE_NODE:
3590+
return ((const pm_local_variable_write_node_t *) node)->value;
3591+
case PM_MULTI_WRITE_NODE:
3592+
return ((const pm_multi_write_node_t *) node)->value;
36023593
case PM_PARENTHESES_NODE: {
3603-
const pm_parentheses_node_t *cast = (pm_parentheses_node_t *)node;
3594+
const pm_parentheses_node_t *cast = (const pm_parentheses_node_t *) node;
36043595
if (cast->body != NULL) {
3605-
return pm_assignment_value_node(cast->body);
3596+
return pm_write_node_value(cast->body);
36063597
}
36073598
return NULL;
36083599
}
36093600
case PM_BEGIN_NODE: {
3610-
const pm_begin_node_t *cast = (pm_begin_node_t *)node;
3601+
const pm_begin_node_t *cast = (const pm_begin_node_t *) node;
36113602
if (cast->statements != NULL) {
3612-
return pm_assignment_value_node((pm_node_t *) cast->statements);
3603+
return pm_write_node_value((const pm_node_t *) cast->statements);
36133604
}
36143605
return NULL;
36153606
}
36163607
case PM_STATEMENTS_NODE: {
36173608
const pm_statements_node_t *cast = (const pm_statements_node_t *) node;
3618-
return pm_assignment_value_node(cast->body.nodes[cast->body.size - 1]);
3609+
return pm_write_node_value(cast->body.nodes[cast->body.size - 1]);
36193610
}
36203611
default:
36213612
return NULL;
@@ -3627,8 +3618,9 @@ pm_assignment_value_node(pm_node_t *node) {
36273618
* literal. If such an assignment is found, it generates a warning.
36283619
*/
36293620
static void
3630-
pm_check_predicate_assignment(pm_parser_t *parser, pm_node_t *predicate) {
3631-
pm_node_t *value = pm_assignment_value_node(predicate);
3621+
pm_predicate_check(pm_parser_t *parser, const pm_node_t *predicate) {
3622+
const pm_node_t *value = pm_write_node_value(predicate);
3623+
36323624
if ((value != NULL) && PM_NODE_FLAG_P(value, PM_NODE_FLAG_STATIC_LITERAL)) {
36333625
pm_parser_warn_token(parser, &parser->current, PM_WARN_EQUAL_IN_CONDITIONAL);
36343626
}
@@ -3647,7 +3639,7 @@ pm_if_node_create(pm_parser_t *parser,
36473639
const pm_token_t *end_keyword
36483640
) {
36493641
pm_conditional_predicate(predicate);
3650-
pm_check_predicate_assignment(parser, predicate);
3642+
pm_predicate_check(parser, predicate);
36513643
pm_if_node_t *node = PM_ALLOC_NODE(parser, pm_if_node_t);
36523644

36533645
const uint8_t *end;
@@ -3687,7 +3679,7 @@ pm_if_node_create(pm_parser_t *parser,
36873679
static pm_if_node_t *
36883680
pm_if_node_modifier_create(pm_parser_t *parser, pm_node_t *statement, const pm_token_t *if_keyword, pm_node_t *predicate) {
36893681
pm_conditional_predicate(predicate);
3690-
pm_check_predicate_assignment(parser, predicate);
3682+
pm_predicate_check(parser, predicate);
36913683
pm_if_node_t *node = PM_ALLOC_NODE(parser, pm_if_node_t);
36923684

36933685
pm_statements_node_t *statements = pm_statements_node_create(parser);
@@ -3720,7 +3712,7 @@ static pm_if_node_t *
37203712
pm_if_node_ternary_create(pm_parser_t *parser, pm_node_t *predicate, const pm_token_t *qmark, pm_node_t *true_expression, const pm_token_t *colon, pm_node_t *false_expression) {
37213713
pm_assert_value_expression(parser, predicate);
37223714
pm_conditional_predicate(predicate);
3723-
pm_check_predicate_assignment(parser, predicate);
3715+
pm_predicate_check(parser, predicate);
37243716

37253717
pm_statements_node_t *if_statements = pm_statements_node_create(parser);
37263718
pm_statements_node_body_append(if_statements, true_expression);
@@ -5964,7 +5956,7 @@ pm_undef_node_append(pm_undef_node_t *node, pm_node_t *name) {
59645956
static pm_unless_node_t *
59655957
pm_unless_node_create(pm_parser_t *parser, const pm_token_t *keyword, pm_node_t *predicate, const pm_token_t *then_keyword, pm_statements_node_t *statements) {
59665958
pm_conditional_predicate(predicate);
5967-
pm_check_predicate_assignment(parser, predicate);
5959+
pm_predicate_check(parser, predicate);
59685960
pm_unless_node_t *node = PM_ALLOC_NODE(parser, pm_unless_node_t);
59695961

59705962
const uint8_t *end;
@@ -6000,7 +5992,7 @@ pm_unless_node_create(pm_parser_t *parser, const pm_token_t *keyword, pm_node_t
60005992
static pm_unless_node_t *
60015993
pm_unless_node_modifier_create(pm_parser_t *parser, pm_node_t *statement, const pm_token_t *unless_keyword, pm_node_t *predicate) {
60025994
pm_conditional_predicate(predicate);
6003-
pm_check_predicate_assignment(parser, predicate);
5995+
pm_predicate_check(parser, predicate);
60045996
pm_unless_node_t *node = PM_ALLOC_NODE(parser, pm_unless_node_t);
60055997

60065998
pm_statements_node_t *statements = pm_statements_node_create(parser);
@@ -6038,7 +6030,7 @@ pm_unless_node_end_keyword_loc_set(pm_unless_node_t *node, const pm_token_t *end
60386030
static pm_until_node_t *
60396031
pm_until_node_create(pm_parser_t *parser, const pm_token_t *keyword, const pm_token_t *closing, pm_node_t *predicate, pm_statements_node_t *statements, pm_node_flags_t flags) {
60406032
pm_until_node_t *node = PM_ALLOC_NODE(parser, pm_until_node_t);
6041-
pm_check_predicate_assignment(parser, predicate);
6033+
pm_predicate_check(parser, predicate);
60426034

60436035
*node = (pm_until_node_t) {
60446036
{
@@ -6064,7 +6056,7 @@ pm_until_node_create(pm_parser_t *parser, const pm_token_t *keyword, const pm_to
60646056
static pm_until_node_t *
60656057
pm_until_node_modifier_create(pm_parser_t *parser, const pm_token_t *keyword, pm_node_t *predicate, pm_statements_node_t *statements, pm_node_flags_t flags) {
60666058
pm_until_node_t *node = PM_ALLOC_NODE(parser, pm_until_node_t);
6067-
pm_check_predicate_assignment(parser, predicate);
6059+
pm_predicate_check(parser, predicate);
60686060

60696061
*node = (pm_until_node_t) {
60706062
{
@@ -6134,7 +6126,7 @@ pm_when_node_statements_set(pm_when_node_t *node, pm_statements_node_t *statemen
61346126
static pm_while_node_t *
61356127
pm_while_node_create(pm_parser_t *parser, const pm_token_t *keyword, const pm_token_t *closing, pm_node_t *predicate, pm_statements_node_t *statements, pm_node_flags_t flags) {
61366128
pm_while_node_t *node = PM_ALLOC_NODE(parser, pm_while_node_t);
6137-
pm_check_predicate_assignment(parser, predicate);
6129+
pm_predicate_check(parser, predicate);
61386130

61396131
*node = (pm_while_node_t) {
61406132
{
@@ -6160,7 +6152,7 @@ pm_while_node_create(pm_parser_t *parser, const pm_token_t *keyword, const pm_to
61606152
static pm_while_node_t *
61616153
pm_while_node_modifier_create(pm_parser_t *parser, const pm_token_t *keyword, pm_node_t *predicate, pm_statements_node_t *statements, pm_node_flags_t flags) {
61626154
pm_while_node_t *node = PM_ALLOC_NODE(parser, pm_while_node_t);
6163-
pm_check_predicate_assignment(parser, predicate);
6155+
pm_predicate_check(parser, predicate);
61646156

61656157
*node = (pm_while_node_t) {
61666158
{
@@ -15937,7 +15929,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
1593715929
} else {
1593815930
receiver = parse_expression(parser, PM_BINDING_POWER_COMPOSITION, true, PM_ERR_NOT_EXPRESSION);
1593915931
pm_conditional_predicate(receiver);
15940-
pm_check_predicate_assignment(parser, receiver);
15932+
pm_predicate_check(parser, receiver);
1594115933

1594215934
if (!parser->recovering) {
1594315935
accept1(parser, PM_TOKEN_NEWLINE);
@@ -15948,7 +15940,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
1594815940
} else {
1594915941
receiver = parse_expression(parser, PM_BINDING_POWER_NOT, true, PM_ERR_NOT_EXPRESSION);
1595015942
pm_conditional_predicate(receiver);
15951-
pm_check_predicate_assignment(parser, receiver);
15943+
pm_predicate_check(parser, receiver);
1595215944
}
1595315945

1595415946
return (pm_node_t *) pm_call_node_not_create(parser, receiver, &message, &arguments);
@@ -16619,7 +16611,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
1661916611
pm_call_node_t *node = pm_call_node_unary_create(parser, &operator, receiver, "!");
1662016612

1662116613
pm_conditional_predicate(receiver);
16622-
pm_check_predicate_assignment(parser, receiver);
16614+
pm_predicate_check(parser, receiver);
1662316615
return (pm_node_t *) node;
1662416616
}
1662516617
case PM_TOKEN_TILDE: {

0 commit comments

Comments
 (0)