[ruby/prism] Remove non-ASCII characters from --dump=parsetree

https://github.com/ruby/prism/commit/6d4cd21e98
This commit is contained in:
Kevin Newton 2024-02-21 10:12:29 -05:00 committed by git
parent 402690c3b6
commit bf680af7b2

View File

@ -29,29 +29,29 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
prettyprint_location(output_buffer, parser, &node->location); prettyprint_location(output_buffer, parser, &node->location);
pm_buffer_append_string(output_buffer, ")\n", 2); pm_buffer_append_string(output_buffer, ")\n", 2);
<%- node.fields.each_with_index do |field, index| -%> <%- node.fields.each_with_index do |field, index| -%>
<%- 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] -%> <%- preadd = index == node.fields.length - 1 ? " " : "| " -%>
// <%= field.name %> // <%= field.name %>
{ {
pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_concat(output_buffer, prefix_buffer);
pm_buffer_append_string(output_buffer, "<%= pointer %><%= field.name %>:", <%= 10 + field.name.length + 1 %>); pm_buffer_append_string(output_buffer, "+-- <%= field.name %>:", <%= 4 + field.name.length + 1 %>);
<%- case field -%> <%- case field -%>
<%- when Prism::NodeField -%> <%- when Prism::NodeField -%>
pm_buffer_append_byte(output_buffer, '\n'); pm_buffer_append_byte(output_buffer, '\n');
size_t prefix_length = prefix_buffer->length; size_t prefix_length = prefix_buffer->length;
pm_buffer_append_string(prefix_buffer, "<%= preadd %>", <%= preadd_bytesize %>); pm_buffer_append_string(prefix_buffer, "<%= preadd %>", 4);
pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_concat(output_buffer, prefix_buffer);
prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>, prefix_buffer); prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>, prefix_buffer);
prefix_buffer->length = prefix_length; prefix_buffer->length = prefix_length;
<%- when Prism::OptionalNodeField -%> <%- when Prism::OptionalNodeField -%>
if (cast-><%= field.name %> == NULL) { if (cast-><%= field.name %> == NULL) {
pm_buffer_append_string(output_buffer, " \xe2\x88\x85\n", 5); pm_buffer_append_string(output_buffer, " nil\n", 5);
} else { } else {
pm_buffer_append_byte(output_buffer, '\n'); pm_buffer_append_byte(output_buffer, '\n');
size_t prefix_length = prefix_buffer->length; size_t prefix_length = prefix_buffer->length;
pm_buffer_append_string(prefix_buffer, "<%= preadd %>", <%= preadd_bytesize %>); pm_buffer_append_string(prefix_buffer, "<%= preadd %>", 4);
pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_concat(output_buffer, prefix_buffer);
prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>, prefix_buffer); prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>, prefix_buffer);
prefix_buffer->length = prefix_length; prefix_buffer->length = prefix_length;
@ -66,17 +66,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
size_t last_index = cast-><%= field.name %>.size; size_t last_index = cast-><%= field.name %>.size;
for (uint32_t index = 0; index < last_index; index++) { for (uint32_t index = 0; index < last_index; index++) {
size_t prefix_length = prefix_buffer->length; size_t prefix_length = prefix_buffer->length;
pm_buffer_append_string(prefix_buffer, "<%= preadd %>", <%= preadd_bytesize %>); pm_buffer_append_string(prefix_buffer, "<%= preadd %>", 4);
pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_concat(output_buffer, prefix_buffer);
pm_buffer_append_string(output_buffer, "+-- ", 4);
if (index == last_index - 1) { pm_buffer_append_string(prefix_buffer, (index == last_index - 1) ? " " : "| ", 4);
pm_buffer_append_string(output_buffer, "\xe2\x94\x94\xe2\x94\x80\xe2\x94\x80 ", 10);
pm_buffer_append_string(prefix_buffer, " ", 4);
} else {
pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 ", 10);
pm_buffer_append_string(prefix_buffer, "\xe2\x94\x82 ", 6);
}
prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>.nodes[index], prefix_buffer); prettyprint_node(output_buffer, parser, (pm_node_t *) cast-><%= field.name %>.nodes[index], prefix_buffer);
prefix_buffer->length = prefix_length; prefix_buffer->length = prefix_length;
} }
@ -86,7 +79,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
pm_buffer_append_byte(output_buffer, '\n'); pm_buffer_append_byte(output_buffer, '\n');
<%- when Prism::OptionalConstantField -%> <%- when Prism::OptionalConstantField -%>
if (cast-><%= field.name %> == 0) { if (cast-><%= field.name %> == 0) {
pm_buffer_append_string(output_buffer, " \xe2\x88\x85\n", 5); pm_buffer_append_string(output_buffer, " nil\n", 5);
} else { } else {
pm_buffer_append_byte(output_buffer, ' '); pm_buffer_append_byte(output_buffer, ' ');
prettyprint_constant(output_buffer, parser, cast-><%= field.name %>); 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
<%- when Prism::OptionalLocationField -%> <%- when Prism::OptionalLocationField -%>
pm_location_t *location = &cast-><%= field.name %>; pm_location_t *location = &cast-><%= field.name %>;
if (location->start == NULL) { if (location->start == NULL) {
pm_buffer_append_string(output_buffer, " \xe2\x88\x85\n", 5); pm_buffer_append_string(output_buffer, " nil\n", 5);
} else { } else {
pm_buffer_append_byte(output_buffer, ' '); pm_buffer_append_byte(output_buffer, ' ');
prettyprint_location(output_buffer, parser, location); prettyprint_location(output_buffer, parser, location);
@ -131,7 +124,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
found = true; found = true;
} }
<%- end -%> <%- end -%>
if (!found) pm_buffer_append_string(output_buffer, " \xe2\x88\x85", 4); if (!found) pm_buffer_append_string(output_buffer, " nil", 4);
pm_buffer_append_byte(output_buffer, '\n'); pm_buffer_append_byte(output_buffer, '\n');
<%- else -%> <%- else -%>
<%- raise -%> <%- raise -%>