Skip to content

Commit 48f2e8c

Browse files
authored
Revert "Frozen parts"
1 parent 0f9df7c commit 48f2e8c

22 files changed

+57
-94
lines changed

src/prism.c

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4281,7 +4281,6 @@ pm_interpolated_regular_expression_node_create(pm_parser_t *parser, const pm_tok
42814281
*node = (pm_interpolated_regular_expression_node_t) {
42824282
{
42834283
.type = PM_INTERPOLATED_REGULAR_EXPRESSION_NODE,
4284-
.flags = PM_NODE_FLAG_STATIC_LITERAL,
42854284
.location = {
42864285
.start = opening->start,
42874286
.end = NULL,
@@ -4303,15 +4302,6 @@ pm_interpolated_regular_expression_node_append(pm_interpolated_regular_expressio
43034302
if (node->base.location.end < part->location.end) {
43044303
node->base.location.end = part->location.end;
43054304
}
4306-
4307-
if (PM_NODE_TYPE_P(part, PM_STRING_NODE)) {
4308-
pm_node_flag_set(part, PM_NODE_FLAG_STATIC_LITERAL | PM_STRING_FLAGS_FROZEN);
4309-
}
4310-
4311-
if (!PM_NODE_FLAG_P(part, PM_NODE_FLAG_STATIC_LITERAL)) {
4312-
pm_node_flag_unset((pm_node_t *) node, PM_NODE_FLAG_STATIC_LITERAL);
4313-
}
4314-
43154305
pm_node_list_append(&node->parts, part);
43164306
}
43174307

@@ -4332,7 +4322,6 @@ pm_interpolated_string_node_create(pm_parser_t *parser, const pm_token_t *openin
43324322
*node = (pm_interpolated_string_node_t) {
43334323
{
43344324
.type = PM_INTERPOLATED_STRING_NODE,
4335-
.flags = PM_NODE_FLAG_STATIC_LITERAL,
43364325
.location = {
43374326
.start = opening->start,
43384327
.end = closing->end,
@@ -4359,14 +4348,6 @@ pm_interpolated_string_node_append(pm_interpolated_string_node_t *node, pm_node_
43594348
node->base.location.start = part->location.start;
43604349
}
43614350

4362-
if (PM_NODE_TYPE_P(part, PM_STRING_NODE)) {
4363-
pm_node_flag_set(part, PM_NODE_FLAG_STATIC_LITERAL | PM_STRING_FLAGS_FROZEN);
4364-
}
4365-
4366-
if (!PM_NODE_FLAG_P(part, PM_NODE_FLAG_STATIC_LITERAL)) {
4367-
pm_node_flag_unset((pm_node_t *) node, PM_NODE_FLAG_STATIC_LITERAL);
4368-
}
4369-
43704351
pm_node_list_append(&node->parts, part);
43714352
node->base.location.end = part->location.end;
43724353
}
@@ -4390,7 +4371,6 @@ pm_interpolated_symbol_node_create(pm_parser_t *parser, const pm_token_t *openin
43904371
*node = (pm_interpolated_symbol_node_t) {
43914372
{
43924373
.type = PM_INTERPOLATED_SYMBOL_NODE,
4393-
.flags = PM_NODE_FLAG_STATIC_LITERAL,
43944374
.location = {
43954375
.start = opening->start,
43964376
.end = closing->end,
@@ -4414,14 +4394,6 @@ pm_interpolated_symbol_node_append(pm_interpolated_symbol_node_t *node, pm_node_
44144394
node->base.location.start = part->location.start;
44154395
}
44164396

4417-
if (PM_NODE_TYPE_P(part, PM_STRING_NODE)) {
4418-
pm_node_flag_set(part, PM_NODE_FLAG_STATIC_LITERAL | PM_STRING_FLAGS_FROZEN);
4419-
}
4420-
4421-
if (!PM_NODE_FLAG_P(part, PM_NODE_FLAG_STATIC_LITERAL)) {
4422-
pm_node_flag_unset((pm_node_t *) node, PM_NODE_FLAG_STATIC_LITERAL);
4423-
}
4424-
44254397
pm_node_list_append(&node->parts, part);
44264398
node->base.location.end = part->location.end;
44274399
}
@@ -4436,7 +4408,6 @@ pm_interpolated_xstring_node_create(pm_parser_t *parser, const pm_token_t *openi
44364408
*node = (pm_interpolated_x_string_node_t) {
44374409
{
44384410
.type = PM_INTERPOLATED_X_STRING_NODE,
4439-
.flags = PM_NODE_FLAG_STATIC_LITERAL,
44404411
.location = {
44414412
.start = opening->start,
44424413
.end = closing->end
@@ -4452,14 +4423,6 @@ pm_interpolated_xstring_node_create(pm_parser_t *parser, const pm_token_t *openi
44524423

44534424
static inline void
44544425
pm_interpolated_xstring_node_append(pm_interpolated_x_string_node_t *node, pm_node_t *part) {
4455-
if (PM_NODE_TYPE_P(part, PM_STRING_NODE)) {
4456-
pm_node_flag_set(part, PM_NODE_FLAG_STATIC_LITERAL | PM_STRING_FLAGS_FROZEN);
4457-
}
4458-
4459-
if (!PM_NODE_FLAG_P(part, PM_NODE_FLAG_STATIC_LITERAL)) {
4460-
pm_node_flag_unset((pm_node_t *) node, PM_NODE_FLAG_STATIC_LITERAL);
4461-
}
4462-
44634426
pm_node_list_append(&node->parts, part);
44644427
node->base.location.end = part->location.end;
44654428
}

test/prism/snapshots/dos_endings.txt

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/prism/snapshots/dstring.txt

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/prism/snapshots/regex.txt

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/prism/snapshots/seattlerb/parse_line_evstr_after_break.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/prism/snapshots/seattlerb/qsymbols_interp.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/prism/snapshots/seattlerb/str_lit_concat_bad_encodings.txt

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/prism/snapshots/seattlerb/words_interp.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/prism/snapshots/spanning_heredoc.txt

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/prism/snapshots/strings.txt

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)