1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/prism] Remove non-ASCII source characters

Browse Source 
(https://github.com/ruby/prism/pull/1787)

https://github.com/ruby/prism/commit/5acc38a2f3
This commit is contained in:
Kevin Newton 2023-11-20 10:53:18 -05:00 committed by git
parent caa9ae7804
commit 75d85f3f6f
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
prism/templates/src/prettyprint.c.erb
View File

@ -1,3 +1,4 @@
<%# encoding: ASCII -%>
#include "prism/prettyprint.h" #include "prism/prettyprint.h"
static void static void
@ -63,29 +64,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 = index == node.fields.length - 1 ? ["└── ", " "] : ["├── ", "│ "] -%> <%- 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] -%>
// <%= 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 %>:", <%= pointer.bytesize + field.name.length + 1 %>); pm_buffer_append_string(output_buffer, "<%= pointer %><%= field.name %>:", <%= 10 + 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 %>", <%= preadd_bytesize %>);
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, " ∅\n", 5); pm_buffer_append_string(output_buffer, " \xe2\x88\x85\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 %>", <%= preadd_bytesize %>);
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;
@ -100,15 +101,15 @@ 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 %>", <%= preadd_bytesize %>);
pm_buffer_concat(output_buffer, prefix_buffer); pm_buffer_concat(output_buffer, prefix_buffer);
if (index == last_index - 1) { if (index == last_index - 1) {
pm_buffer_append_string(output_buffer, "└── ", 10); pm_buffer_append_string(output_buffer, "\xe2\x94\x94\xe2\x94\x80\xe2\x94\x80 ", 10);
pm_buffer_append_string(prefix_buffer, " ", 4); pm_buffer_append_string(prefix_buffer, " ", 4);
} else { } else {
pm_buffer_append_string(output_buffer, "├── ", 10); pm_buffer_append_string(output_buffer, "\xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80 ", 10);
pm_buffer_append_string(prefix_buffer, "│ ", 6); 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);
@ -120,7 +121,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, " ∅\n", 5); pm_buffer_append_string(output_buffer, " \xe2\x88\x85\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 %>);
@ -143,7 +144,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, " ∅\n", 5); pm_buffer_append_string(output_buffer, " \xe2\x88\x85\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);
@ -163,7 +164,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, " ∅", 4); if (!found) pm_buffer_append_string(output_buffer, " \xe2\x88\x85", 4);
pm_buffer_append_byte(output_buffer, '\n'); pm_buffer_append_byte(output_buffer, '\n');
<%- else -%> <%- else -%>
<%- raise -%> <%- raise -%>

8
prism/templates/template.rb
View File

@ -378,6 +378,14 @@ module Prism
(contents = contents.b).gsub!(/[^\t-~]/) {|c| "\\x%.2x" % c.ord} (contents = contents.b).gsub!(/[^\t-~]/) {|c| "\\x%.2x" % c.ord}
end end
if (extension == ".c" || extension == ".h") && !contents.ascii_only?
# Enforce that we only have ASCII characters here. This is necessary
# for some locales that only allow ASCII characters in C source files.
contents.each_line.with_index(1) do |line, line_number|
raise "Non-ASCII character on line #{line_number} of #{write_to}" unless line.ascii_only?
end
end
FileUtils.mkdir_p(File.dirname(write_to)) FileUtils.mkdir_p(File.dirname(write_to))
File.write(write_to, contents) File.write(write_to, contents)
end end