| author |  fardragon <michaldrozd@protonmail.ch> 2026-06-04 18:41:41+00:00 |
| committer | fardragon <michaldrozd@protonmail.ch> 2026-06-05 14:59:18+02:00 |
| log | be18e17ce528f5e4a0cda5f694c8ad13a6b38662 |
| tree | 28f66a8ebc8651553cc8cd0972765a25d5336706 |
| parent | cf741692f7c34b1bd3269fdd7437903bad64804d |
Fix unexpected trailing whitespace for cmakedefine with no replacement value
3 files changed, 7 insertions(+), 4 deletions(-)
lib- compiler
- Maker
- Step
- test
- standalone
- config_header
lib/compiler/Maker/Step/ConfigHeader.zig+6-1
| ... | @@ -418,7 +418,12 @@ fn renderValueC(conf: *const Configuration, w: *Writer, name: []const u8, value: | ... | @@ -418,7 +418,12 @@ fn renderValueC(conf: *const Configuration, w: *Writer, name: []const u8, value: |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | fn renderValueCIdent(w: *Writer, name: []const u8, ident: []const u8) Writer.Error!void { | 420 | fn renderValueCIdent(w: *Writer, name: []const u8, ident: []const u8) Writer.Error!void { |
| 421 | return w.print("#define {s} {s}\n", .{ name, ident }); | 421 | try w.print("#define {s}", .{name}); |
| 422 | if (ident.len > 0) { | ||
| 423 | try w.writeByte(' '); | ||
| 424 | try w.writeAll(ident); | ||
| 425 | } | ||
| 426 | return w.writeByte('\n'); | ||
| 422 | } | 427 | } |
| 423 | 428 | ||
| 424 | fn renderValueCBool(w: *Writer, name: []const u8, b: bool) Writer.Error!void { | 429 | fn renderValueCBool(w: *Writer, name: []const u8, b: bool) Writer.Error!void { |
test/standalone/config_header/cmake/cmakedefine_edge_cases.h+1-2
| ... | @@ -6,8 +6,7 @@ | ... | @@ -6,8 +6,7 @@ |
| 6 | /* #undef MULTI_WORD_FALSE */ | 6 | /* #undef MULTI_WORD_FALSE */ |
| 7 | 7 | ||
| 8 | // cmakedefine with no replacement value (truthy) | 8 | // cmakedefine with no replacement value (truthy) |
| 9 | // TODO: unexpected whitespace is being added here | 9 | #define NO_VALUE |
| 10 | #define NO_VALUE | ||
| 11 | 10 | ||
| 12 | // cmakedefine with no replacement value (falsy) | 11 | // cmakedefine with no replacement value (falsy) |
| 13 | /* #undef NO_VALUE_FALSE */ | 12 | /* #undef NO_VALUE_FALSE */ |
test/standalone/config_header/cmake/cmakedefine_edge_cases.h.in-1
| ... | @@ -5,7 +5,6 @@ | ... | @@ -5,7 +5,6 @@ |
| 5 | #cmakedefine MULTI_WORD_FALSE "hello world" | 5 | #cmakedefine MULTI_WORD_FALSE "hello world" |
| 6 | 6 | ||
| 7 | // cmakedefine with no replacement value (truthy) | 7 | // cmakedefine with no replacement value (truthy) |
| 8 | // TODO: unexpected whitespace is being added here | ||
| 9 | #cmakedefine NO_VALUE | 8 | #cmakedefine NO_VALUE |
| 10 | 9 | ||
| 11 | // cmakedefine with no replacement value (falsy) | 10 | // cmakedefine with no replacement value (falsy) |