Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'emekoi-windowsver-fix' 

closes #5011
master
Andrew Kelley 2020-07-05 22:44:46 +00:00
parent 27c1e0b453 86ef3202dd
commit 682fccaaf0
3 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/std/target.zig
View File

@ -101,6 +101,38 @@ pub const Target = struct {
return @enumToInt(ver) >= @enumToInt(self.min) and @enumToInt(ver) <= @enumToInt(self.max);
}
};
/// This function is defined to serialize a Zig source code representation of this
/// type, that, when parsed, will deserialize into the same data.
pub fn format(
self: WindowsVersion,
comptime fmt: []const u8,
options: std.fmt.FormatOptions,
out_stream: var,
) !void {
if (fmt.len > 0 and fmt[0] == 's') {
if (
@enumToInt(self) >= @enumToInt(WindowsVersion.nt4) and @enumToInt(self) <= @enumToInt(WindowsVersion.win10_19h1)
) {
try std.fmt.format(out_stream, ".{}", .{@tagName(self)});
} else {
try std.fmt.format(out_stream,
"@intToEnum(Target.Os.WindowsVersion, {})",
.{ @enumToInt(self) }
);
}
} else {
if (
@enumToInt(self) >= @enumToInt(WindowsVersion.nt4) and @enumToInt(self) <= @enumToInt(WindowsVersion.win10_19h1)
) {
try std.fmt.format(out_stream, "WindowsVersion.{}", .{@tagName(self)});
} else {
try std.fmt.format(out_stream, "WindowsVersion(", .{@typeName(@This())});
try std.fmt.format(out_stream, "{}", .{@enumToInt(self)});
try out_stream.writeAll(")");
}
}
}
};
pub const LinuxVersionRange = struct {

4
lib/std/zig/cross_target.zig
View File

@ -514,14 +514,14 @@ pub const CrossTarget = struct {
switch (self.getOsVersionMin()) {
.none => {},
.semver => |v| try result.outStream().print(".{}", .{v}),
.windows => |v| try result.outStream().print(".{}", .{@tagName(v)}),
.windows => |v| try result.outStream().print("{s}", .{v}),
}
}
if (self.os_version_max) |max| {
switch (max) {
.none => {},
.semver => |v| try result.outStream().print("...{}", .{v}),
.windows => |v| try result.outStream().print("...{}", .{@tagName(v)}),
.windows => |v| try result.outStream().print("..{s}", .{v}),
}
}

25
src-self-hosted/stage2.zig
View File

@ -653,23 +653,6 @@ export fn stage2_libc_render(stage1_libc: *Stage2LibCInstallation, output_file:
return .None;
}
fn enumToString(value: var, type_name: []const u8) ![]const u8 {
switch (@typeInfo(@TypeOf(value))) {
.Enum => |e| {
if (e.is_exhaustive) {
return std.fmt.allocPrint(std.heap.c_allocator, ".{}", .{@tagName(value)});
} else {
return std.fmt.allocPrint(
std.heap.c_allocator,
"@intToEnum({}, {})",
.{ type_name, @enumToInt(value) },
);
}
},
else => unreachable,
}
}
// ABI warning
const Stage2Target = extern struct {
arch: c_int,
@ -887,13 +870,13 @@ const Stage2Target = extern struct {
.windows => try os_builtin_str_buffer.outStream().print(
\\ .windows = .{{
\\ .min = {},
\\ .max = {},
\\ .min = {s},
\\ .max = {s},
\\ }}}},
\\
, .{
try enumToString(target.os.version_range.windows.min, "Target.Os.WindowsVersion"),
try enumToString(target.os.version_range.windows.max, "Target.Os.WindowsVersion"),
target.os.version_range.windows.min,
target.os.version_range.windows.max,
}),
}
try os_builtin_str_buffer.appendSlice("};\n");