| author |  Andrew Kelley <andrew@ziglang.org> 2021-02-23 13:55:12-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2021-02-23 13:55:12-07:00 |
| log | f041425e48b2f65fd4262d3c9ba210c410322d02 |
| tree | 84afa4cb4f1c450ef4676f4c1c564a1b483f7a04 |
| parent | 01e89c91717b1f9102429d4809c40d53d751a806 |
translate-c: fix using wrong slice and AST tag
2 files changed, 11 insertions(+), 2 deletions(-)
- CMakeLists.txt
src- translate_c
CMakeLists.txt+1-1
| ... | @@ -572,12 +572,12 @@ set(ZIG_STAGE2_SOURCES | ... | @@ -572,12 +572,12 @@ set(ZIG_STAGE2_SOURCES |
| 572 | "${CMAKE_SOURCE_DIR}/src/target.zig" | 572 | "${CMAKE_SOURCE_DIR}/src/target.zig" |
| 573 | "${CMAKE_SOURCE_DIR}/src/tracy.zig" | 573 | "${CMAKE_SOURCE_DIR}/src/tracy.zig" |
| 574 | "${CMAKE_SOURCE_DIR}/src/translate_c.zig" | 574 | "${CMAKE_SOURCE_DIR}/src/translate_c.zig" |
| 575 | "${CMAKE_SOURCE_DIR}/src/translate_c/ast.zig" | ||
| 575 | "${CMAKE_SOURCE_DIR}/src/type.zig" | 576 | "${CMAKE_SOURCE_DIR}/src/type.zig" |
| 576 | "${CMAKE_SOURCE_DIR}/src/value.zig" | 577 | "${CMAKE_SOURCE_DIR}/src/value.zig" |
| 577 | "${CMAKE_SOURCE_DIR}/src/windows_sdk.zig" | 578 | "${CMAKE_SOURCE_DIR}/src/windows_sdk.zig" |
| 578 | "${CMAKE_SOURCE_DIR}/src/zir.zig" | 579 | "${CMAKE_SOURCE_DIR}/src/zir.zig" |
| 579 | "${CMAKE_SOURCE_DIR}/src/zir_sema.zig" | 580 | "${CMAKE_SOURCE_DIR}/src/zir_sema.zig" |
| 580 | "${CMAKE_SOURCE_DIR}/src/translate_c/ast.zig" | ||
| 581 | ) | 581 | ) |
| 582 | 582 | ||
| 583 | if(MSVC) | 583 | if(MSVC) |
src/translate_c/ast.zig+10-1
| ... | @@ -1809,7 +1809,16 @@ fn renderRecord(c: *Context, node: Node) !NodeIndex { | ... | @@ -1809,7 +1809,16 @@ fn renderRecord(c: *Context, node: Node) !NodeIndex { |
| 1809 | } | 1809 | } |
| 1810 | _ = try c.addToken(.r_brace, "}"); | 1810 | _ = try c.addToken(.r_brace, "}"); |
| 1811 | 1811 | ||
| 1812 | if (members.len <= 2) { | 1812 | if (payload.fields.len == 0) { |
| 1813 | return c.addNode(.{ | ||
| 1814 | .tag = .container_decl_two, | ||
| 1815 | .main_token = kind_tok, | ||
| 1816 | .data = .{ | ||
| 1817 | .lhs = 0, | ||
| 1818 | .rhs = 0, | ||
| 1819 | }, | ||
| 1820 | }); | ||
| 1821 | } else if (payload.fields.len <= 2) { | ||
| 1813 | return c.addNode(.{ | 1822 | return c.addNode(.{ |
| 1814 | .tag = .container_decl_two_trailing, | 1823 | .tag = .container_decl_two_trailing, |
| 1815 | .main_token = kind_tok, | 1824 | .main_token = kind_tok, |