motiejus/zig
1
Fork 0
Code Releases Activity

fix escape sequence rendering

Browse Source
This commit is contained in:
Vexu
2019-07-21 14:35:45 +03:00
committed by Andrew Kelley
parent 16be70cbbf
commit 57aa8997bd
2 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ast_render.cpp
View File

@@ -319,6 +319,9 @@ static bool is_digit(uint8_t c) {
}
static bool is_printable(uint8_t c) {
if (c == 0) {
return false;
}
static const uint8_t printables[] =
" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.~`!@#$%^&*()_-+=\\{}[];'\"?/<>,:";
for (size_t i = 0; i < array_length(printables); i += 1) {
@@ -337,20 +340,12 @@ static void string_literal_escape(Buf *source, Buf *dest) {
buf_append_str(dest, "\\\"");
} else if (c == '\\') {
buf_append_str(dest, "\\\\");
} else if (c == '\a') {
buf_append_str(dest, "\\a");
} else if (c == '\b') {
buf_append_str(dest, "\\b");
} else if (c == '\f') {
buf_append_str(dest, "\\f");
} else if (c == '\n') {
buf_append_str(dest, "\\n");
} else if (c == '\r') {
buf_append_str(dest, "\\r");
} else if (c == '\t') {
buf_append_str(dest, "\\t");
} else if (c == '\v') {
buf_append_str(dest, "\\v");
} else if (is_printable(c)) {
buf_append_char(dest, c);
} else {
@@ -630,7 +625,19 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) {
case NodeTypeCharLiteral:
{
uint8_t c = node->data.char_literal.value;
if (is_printable(c)) {
if (c == '\'') {
fprintf(ar->f, "'\\''");
} else if (c == '\"') {
fprintf(ar->f, "'\\\"'");
} else if (c == '\\') {
fprintf(ar->f, "'\\\\'");
} else if (c == '\n') {
fprintf(ar->f, "'\\n'");
} else if (c == '\r') {
fprintf(ar->f, "'\\r'");
} else if (c == '\t') {
fprintf(ar->f, "'\\t'");
} else if (is_printable(c)) {
fprintf(ar->f, "'%c'", c);
} else {
fprintf(ar->f, "'\\x%02x'", (int)c);