Commit 57aa8997bd0b651d56a22efee46598fff167253d | zig

author	Veikka Tuominen <git@vexu.eu> 2019-07-21 14:35:45+03:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-07-23 14:49:19-04:00
log	57aa8997bd0b651d56a22efee46598fff167253d
tree	8a09d59e15b0c5df10c1aaf8b9d76e5db57ac86c
parent	16be70cbbf8e6dc658b9fcacd3366df8f83fffa8

fix escape sequence rendering

2 files changed, 50 insertions(+), 9 deletions(-)

src
- ast_render.cpp
test
- translate_c.zig

src/ast_render.cpp+16-9

 @@ -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);

test/translate_c.zig+34

...	@@ -1780,6 +1780,40 @@ pub fn addCases(cases: *tests.TranslateCContext) void {	...	@@ -1780,6 +1780,40 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
1780	\\}	1780	\\}
1781	);	1781	);
1782		1782
		1783	cases.addC("escape sequences",
		1784	\\const char *escapes() {
		1785	\\char a = '\'',
		1786	\\ b = '\\',
		1787	\\ c = '\a',
		1788	\\ d = '\b',
		1789	\\ e = '\f',
		1790	\\ f = '\n',
		1791	\\ g = '\r',
		1792	\\ h = '\t',
		1793	\\ i = '\v',
		1794	\\ j = '\0',
		1795	\\ k = '\"';
		1796	\\ return "\'\\\a\b\f\n\r\t\v\0\"";
		1797	\\}
		1798	\\
		1799	,
		1800	\\pub export fn escapes() [*c]const u8 {
		1801	\\ var a: u8 = u8('\'');
		1802	\\ var b: u8 = u8('\\');
		1803	\\ var c: u8 = u8('\x07');
		1804	\\ var d: u8 = u8('\x08');
		1805	\\ var e: u8 = u8('\x0c');
		1806	\\ var f: u8 = u8('\n');
		1807	\\ var g: u8 = u8('\r');
		1808	\\ var h: u8 = u8('\t');
		1809	\\ var i: u8 = u8('\x0b');
		1810	\\ var j: u8 = u8('\x00');
		1811	\\ var k: u8 = u8('\"');
		1812	\\ return c"\'\\\x07\x08\x0c\n\r\t\x0b\x00\"";
		1813	\\}
		1814	\\
		1815	);
		1816
1783	/////////////// Cases for only stage1 because stage2 behavior is better ////////////////	1817	/////////////// Cases for only stage1 because stage2 behavior is better ////////////////
1784	cases.addC("Parameterless function prototypes",	1818	cases.addC("Parameterless function prototypes",
1785	\\void foo() {}	1819	\\void foo() {}