mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 9d6750935e into 9082b004b6

Browse source
This commit is contained in:
Jan 2025-11-23 22:57:06 +00:00 • committed by GitHub
commit fbc3664e4f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/std/Build/Step/ConfigHeader.zig
View file

@ -705,10 +705,12 @@ fn expand_variables_cmake(
const key_start = open_pos.target + open_var.len;
const key = result.items[key_start..];
if (key.len == 0) {
return error.MissingKey;
}
const value = values.get(key) orelse return error.MissingValue;
const value = values.get(key) orelse
if (key.len == 0)
.undef
else
return error.MissingValue;
result.shrinkRetainingCapacity(result.items.len - key.len - open_var.len);
switch (value) {
.undef, .defined => {},
@ -909,8 +911,8 @@ test "expand_variables_cmake simple cases" {
// line with misc content is preserved
try testReplaceVariablesCMake(allocator, "no substitution", "no substitution", values);
// empty ${} wrapper leads to an error
try std.testing.expectError(error.MissingKey, testReplaceVariablesCMake(allocator, "${}", "", values));
// empty ${} wrapper is removed
try testReplaceVariablesCMake(allocator, "${}", "", values);
// empty @ sigils are preserved
try testReplaceVariablesCMake(allocator, "@", "@", values);

3
test/standalone/cmakedefine/config.h.in
View file

@ -94,6 +94,9 @@
// test10
// @noval@@stringval@@trueval@@zeroval@
// empty key, removed
// ${}
// no substition
// ${noval}

3
test/standalone/cmakedefine/expected_config.h
View file

@ -94,6 +94,9 @@
// test10
// test10
// empty key, removed
//
// no substition
//