zig

commit e23bc1f76af298e7ba0140e442858c1faa98e379 (tree)
parent 4ca1f4ec2e3ae1a08295bc6ed03c235cb7700ab9
Author: Timon Kruiper <timonkruiper@gmail.com>
Date:   Sat, 23 Jan 2021 17:33:59 +0100

render: fix bug when rendering struct initializer with length 1

This crashed the compiler when running translate-c. See the added test.

Diffstat:
M
lib/std/zig/render.zig
 | 
16
++++++++--------
M
test/translate_c.zig
 | 
12
++++++++++++

2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/lib/std/zig/render.zig b/lib/std/zig/render.zig
@@ -965,13 +965,13 @@ fn renderExpression(
             };
 
             if (field_inits.len == 1) blk: {
-                const field_init = field_inits[0].cast(ast.Node.FieldInitializer).?;
-
-                switch (field_init.expr.tag) {
-                    .StructInitializer,
-                    .StructInitializerDot,
-                    => break :blk,
-                    else => {},
+                if (field_inits[0].cast(ast.Node.FieldInitializer)) |field_init| {
+                    switch (field_init.expr.tag) {
+                        .StructInitializer,
+                        .StructInitializerDot,
+                        => break :blk,
+                        else => {},
+                    }
                 }
 
                 // if the expression outputs to multiline, make this struct multiline
@@ -984,7 +984,7 @@ fn renderExpression(
                     .node => |node| try renderExpression(allocator, ais, tree, node, Space.None),
                 }
                 try renderToken(tree, ais, lbrace, Space.Space);
-                try renderExpression(allocator, ais, tree, &field_init.base, Space.Space);
+                try renderExpression(allocator, ais, tree, field_inits[0], Space.Space);
                 return renderToken(tree, ais, rtoken, space);
             }
 
diff --git a/test/translate_c.zig b/test/translate_c.zig
@@ -102,6 +102,11 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
         \\} Color;
         \\#define CLITERAL(type)      (type)
         \\#define LIGHTGRAY  CLITERAL(Color){ 200, 200, 200, 255 }   // Light Gray
+        \\typedef struct boom_t
+        \\{
+        \\    int i1;
+        \\} boom_t;
+        \\#define FOO ((boom_t){1})
     , &[_][]const u8{ // TODO properly translate this
         \\pub const struct_Color = extern struct {
         \\    r: u8,
@@ -116,6 +121,13 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
         \\}
         ,
         \\pub const LIGHTGRAY = @import("std").mem.zeroInit(CLITERAL(Color), .{ 200, 200, 200, 255 });
+        ,
+        \\pub const struct_boom_t = extern struct {
+        \\    i1: c_int,
+        \\};
+        \\pub const boom_t = struct_boom_t;
+        ,
+        \\pub const FOO = @import("std").mem.zeroInit(boom_t, .{ 1 });
     });
 
     cases.add("complex switch",