Skip to content

Commit 6d4cd21

Browse files
committed
Remove non-ASCII characters from --dump=parsetree
1 parent eab4f96 commit 6d4cd21

File tree

1 file changed

+11
-18
lines changed

1 file changed

+11
-18
lines changed

templates/src/prettyprint.c.erb

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,29 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
2929
prettyprint_location(output_buffer, parser, &node->location);
3030
pm_buffer_append_string(output_buffer, ")\n", 2);
3131
<%- node.fields.each_with_index do |field, index| -%>
32-
<%- pointer, preadd, preadd_bytesize = index == node.fields.length - 1 ? ["\\xe2\\x94\\x94\\xe2\\x94\\x80\\xe2\\x94\\x80 ", " ", 4] : ["\\xe2\\x94\\x9c\\xe2\\x94\\x80\\xe2\\x94\\x80 ", "\\xe2\\x94\\x82 ", 6] -%>
32+
<%- preadd = index == node.fields.length - 1 ? " " : "| " -%>
3333

3434
// <%= field.name %>
3535
{
3636
pm_buffer_concat(output_buffer, prefix_buffer);
37-
pm_buffer_append_string(output_buffer, "<%= pointer %><%= field.name %>:", <%= 10 + field.name.length + 1 %>);
37+
pm_buffer_append_string(output_buffer, "+-- <%= field.name %>:", <%= 4 + field.name.length + 1 %>);
3838
<%- case field -%>
3939
<%- when Prism::NodeField -%>
4040
pm_buffer_append_byte(output_buffer, '\n');
4141

4242
size_t prefix_length = prefix_buffer->length;
43-
pm_buffer_append_string(prefix_buffer, "<%= preadd %>", <%= preadd_bytesize %>);
43+
pm_buffer_append_string(prefix_buffer, "<%= preadd %>", 4);
4444
pm_buffer_concat(output_buffer, prefix_buffer);
4545
prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>, prefix_buffer);
4646
prefix_buffer->length = prefix_length;
4747
<%- when Prism::OptionalNodeField -%>
4848
if (cast-><%= field.name %> == NULL) {
49-
pm_buffer_append_string(output_buffer, " \xe2\x88\x85\n", 5);
49+
pm_buffer_append_string(output_buffer, " nil\n", 5);
5050
} else {
5151
pm_buffer_append_byte(output_buffer, '\n');
5252

5353
size_t prefix_length = prefix_buffer->length;
54-
pm_buffer_append_string(prefix_buffer, "<%= preadd %>", <%= preadd_bytesize %>);
54+
pm_buffer_append_string(prefix_buffer, "<%= preadd %>", 4);
5555
pm_buffer_concat(output_buffer, prefix_buffer);
5656
prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>, prefix_buffer);
5757
prefix_buffer->length = prefix_length;
@@ -66,17 +66,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
6666
size_t last_index = cast-><%= field.name %>.size;
6767
for (uint32_t index = 0; index < last_index; index++) {
6868
size_t prefix_length = prefix_buffer->length;
69-
pm_buffer_append_string(prefix_buffer, "<%= preadd %>", <%= preadd_bytesize %>);
69+
pm_buffer_append_string(prefix_buffer, "<%= preadd %>", 4);
7070
pm_buffer_concat(output_buffer, prefix_buffer);
71-
72-
if (index == last_index - 1) {
73-
pm_buffer_append_string(output_buffer, "\xe2\x94\x94\xe2\x94\x80\xe2\x94\x80 ", 10);
74-
pm_buffer_append_string(prefix_buffer, " ", 4);
75-
} else {
76-
pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 ", 10);
77-
pm_buffer_append_string(prefix_buffer, "\xe2\x94\x82 ", 6);
78-
}
79-
71+
pm_buffer_append_string(output_buffer, "+-- ", 4);
72+
pm_buffer_append_string(prefix_buffer, (index == last_index - 1) ? " " : "| ", 4);
8073
prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>.nodes[index], prefix_buffer);
8174
prefix_buffer->length = prefix_length;
8275
}
@@ -86,7 +79,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
8679
pm_buffer_append_byte(output_buffer, '\n');
8780
<%- when Prism::OptionalConstantField -%>
8881
if (cast-><%= field.name %> == 0) {
89-
pm_buffer_append_string(output_buffer, " \xe2\x88\x85\n", 5);
82+
pm_buffer_append_string(output_buffer, " nil\n", 5);
9083
} else {
9184
pm_buffer_append_byte(output_buffer, ' ');
9285
prettyprint_constant(output_buffer, parser, cast-><%= field.name %>);
@@ -109,7 +102,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
109102
<%- when Prism::OptionalLocationField -%>
110103
pm_location_t *location = &cast-><%= field.name %>;
111104
if (location->start == NULL) {
112-
pm_buffer_append_string(output_buffer, " \xe2\x88\x85\n", 5);
105+
pm_buffer_append_string(output_buffer, " nil\n", 5);
113106
} else {
114107
pm_buffer_append_byte(output_buffer, ' ');
115108
prettyprint_location(output_buffer, parser, location);
@@ -131,7 +124,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
131124
found = true;
132125
}
133126
<%- end -%>
134-
if (!found) pm_buffer_append_string(output_buffer, " \xe2\x88\x85", 4);
127+
if (!found) pm_buffer_append_string(output_buffer, " nil", 4);
135128
pm_buffer_append_byte(output_buffer, '\n');
136129
<%- else -%>
137130
<%- raise -%>

0 commit comments

Comments
 (0)